用户信息新增修改，电子卡新增修改，积分新增修改

YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java

@@ -493,18 +493,13 @@ public class AppUserInfoController {
                         wxInfo.setStationId(request.getStationId());
                         //判断当前登录是否存在手机号
                         if(StringUtils.isNotBlank(request.getMobilePhone())){
+                            appUserInfo.setMinaOpenid(openId);
                             wxInfo.setMobilePhone(request.getMobilePhone());
                             AppUserInfo wxInfoResult = appUserInfoService.getAppUserInfo(wxInfo);
                             if(wxInfoResult !=null){
-                                //如果不为空，则说明存在支付宝小程序用户信息；
+                                //如果不为空，则说明存在小程序用户信息；
+                                appUserInfo.setUpdateDate(new Date());
                                 appUserInfoService.updateAppUserInfo(appUserInfo);
-                                //获取客户公众号的openId，将微信公众号的openId添加到已存在的支付宝小程序用户信息上
-                                //1.获取openId
-
-                                //2.更新
-
-                                //3.删除改用户已存在公众号信息
-
                             }else {
                                 //否则，根据unionID查询用户信息
                                 wxInfo.setUnionId(request.getUnionId());
@@ -512,19 +507,24 @@ public class AppUserInfoController {
                                 AppUserInfo appUserInfoByUnionID = appUserInfoService.getAppUserInfo(wxInfo);
                                 if(appUserInfoByUnionID !=null){
                                     //如果不为空，则说明存在公众号用户信息
+                                    appUserInfo.setUpdateDate(new Date());
                                     appUserInfoService.updateAppUserInfo(appUserInfo);
                                 }else {
                                     //否则，新增用户信息
+                                    appUserInfo.setRegisteDate(new Date());
                                     appUserInfoService.AddAppUserInfo(appUserInfo);
                                 }
                             }
                         }else {
+                            appUserInfo.setBlogOpenid(openId);
                             //如果没有手机号，则说明是用户公众号登录
                             wxInfo.setUnionId(request.getUnionId());
                             AppUserInfo appUserInfoNoPhone = appUserInfoService.getAppUserInfo(wxInfo);
                             if(appUserInfoNoPhone !=null){
+                                appUserInfo.setUpdateDate(new Date());
                                 appUserInfoService.updateAppUserInfo(appUserInfo);
                             }else {
+                                appUserInfo.setRegisteDate(new Date());
                                 appUserInfoService.AddAppUserInfo(appUserInfo);
                             }
                         }
@@ -537,7 +537,8 @@ public class AppUserInfoController {
                             aLiInfo.setMobilePhone(request.getMobilePhone());
                             AppUserInfo appUserInfos = appUserInfoService.getAppUserInfo(aLiInfo);
                             if(appUserInfos !=null){
-                                //如果不为空，则说明用户存在微信小程序用户信息
+                                //如果不为空，则说明用户存在小程序用户信息
+                                appUserInfo.setUpdateDate(new Date());
                                 appUserInfoService.updateAppUserInfo(appUserInfo);
                                 //删除用户支付宝的公众号信息
                                 //appUserInfoService.delAliInfo();
@@ -547,8 +548,10 @@ public class AppUserInfoController {
                                 AppUserInfo appUserInfoByAliId = appUserInfoService.getAppUserInfo(aLiInfo);
                                 if(appUserInfoByAliId !=null){
                                     //如果不为空则说明存在支付宝公众号
+                                    appUserInfo.setUpdateDate(new Date());
                                     appUserInfoService.updateAppUserInfo(appUserInfo);
                                 }else {
+                                    appUserInfo.setRegisteDate(new Date());
                                     appUserInfoService.AddAppUserInfo(appUserInfo);
                                 }
                             }
@@ -558,51 +561,16 @@ public class AppUserInfoController {
                             AppUserInfo appUserInfoNoPhone = appUserInfoService.getAppUserInfo(aLiInfo);
                             if(appUserInfoNoPhone !=null){
                                 //说明存在支付宝小程序用户信息
+                                appUserInfo.setUpdateDate(new Date());
                                 appUserInfoService.updateAppUserInfo(appUserInfo);
                             }else {
                                 //不存在
+                                appUserInfo.setRegisteDate(new Date());
                                 appUserInfoService.AddAppUserInfo(appUserInfo);
                             }
                         }
                         break;
                 }
-
-
-                //1-微信公众号
-                if(request.getUserType().equals("1") &&StringUtils.isNotBlank(request.getOpenId())){
-                    appUserInfo.setUserType(request.getUserType());
-                    openId = request.getOpenId();
-                    appUserInfo.setBlogOpenid(openId);
-                    customerPoints.setBlogOpenId(openId);
-                    customerElectronicCard.setBlogOpenid(openId);
-                    //2-微信小程序
-                }else if(request.getUserType().equals("2") &&StringUtils.isNotBlank(request.getOpenId())){
-                    appUserInfo.setUserType(request.getUserType());
-                    openId = request.getOpenId();
-                    appUserInfo.setMinaOpenid(openId);
-                    customerPoints.setMinaOpenId(openId);
-                    customerElectronicCard.setMinaOpenid(openId);
-                }else if(request.getUserType().equals("3") && StringUtils.isNotBlank(request.getOpenId())){
-                    appUserInfo.setALiId(openId);
-                    openId = request.getOpenId();
-                }else if(request.getUserType().equals("4") && StringUtils.isNotBlank(request.getOpenId())){
-                    appUserInfo.setALiId(openId);
-                    openId = request.getOpenId();
-                }
-            }
-
-
-            logger.info("插入数据库用户信息参数："+appUserInfo.toString());
-            Map<String, Object> params = new HashMap<>();
-            params.put("openId", openId);                   //注册用户openId
-            params.put("userType", request.getUserType());  //用户类型
-            //判断该用户是否已存在
-            int count = appUserInfoService.isExistAppUser(params);
-            if(count > 0){
-                appUserInfo.setUpdateDate(new Date());
-                appUserInfoService.updateAppUserInfo(appUserInfo);
-            }else {
-                appUserInfoService.AddAppUserInfo(appUserInfo);
             }
             StationInfo stationInfo = new StationInfo();
             stationInfo.setStationId(request.getStationId());
@@ -630,51 +598,45 @@ public class AppUserInfoController {
 
     //客户积分表信息操作
     public void insertCustomerPointsInfo(CustomerPoints customerPoints, AppUserInfoRequest request){
-        boolean boo = customerPointsService.isExistCustomerPointsInfo(customerPoints);
-        if(!boo){
-            customerPointsService.insertCustomerPointsInfo(customerPoints);
-        }else {
-            //此处用于：如果客户积分信息存在可能会出现小程序ID或者公众号ID没有的情况
+        CustomerPoints customerPointsInfo = customerPointsService.getCustomerPointsInfo(customerPoints);
+        if(customerPointsInfo !=null){
             CustomerPoints c = new CustomerPoints();
             c.setUnionId(customerPoints.getUnionId());
-            if(request.getUserType().equals("1")){
-                c.setBlogOpenId(customerPoints.getBlogOpenId());
-            }else if(request.getUserType().equals("2")){
-                c.setMinaOpenId(customerPoints.getMinaOpenId());
-            }
             c.setStationId(request.getStationId());
-            c.setStationName(request.getStationName());
             c.setMobilePhone(request.getMobilePhone());
             c.setStationId(request.getStationId());
-            c.setCustomerName(request.getBlogNickName());
-            c.setStationName(request.getStationName());
             customerPointsService.updateCustomerPointsInfo(c);
+        }else {
+            customerPointsService.insertCustomerPointsInfo(customerPoints);
         }
     }
 
     //客户电子会员卡表操作
     public void insertCustomerElectronicCard(CustomerElectronicCard customerElectronicCard, AppUserInfoRequest request, StationInfo stationInfos){
-
-        List<CustomerElectronicCard> electronicCardList = electronicMembershipCardService.getElectronicCardList(customerElectronicCard);
-        if(electronicCardList !=null && electronicCardList.size() ==2){
-            customerElectronicCard.setCreateTime(null);
-            electronicMembershipCardService.updateElectronicCardInfoByUnionId(customerElectronicCard);
-        }else {
-            //当前时间戳
-            String currentTime = String.valueOf(System.currentTimeMillis());
-            String customerNo = request.getStationId() + currentTime;
-            customerElectronicCard.setStationName(request.getStationName());
-            customerElectronicCard.setCustomerNo(customerNo);
-            customerElectronicCard.setAmt(new BigDecimal(0));
-            customerElectronicCard.setCardOilsType("1");
-            electronicMembershipCardService.insetElectronicCard(customerElectronicCard);
-            customerElectronicCard.setCardOilsType("2");
-            String currentTime1 = String.valueOf(System.currentTimeMillis());
-            String customerNo1 = request.getStationId() + currentTime1;
-            customerElectronicCard.setCustomerNo(customerNo1);
-            electronicMembershipCardService.insetElectronicCard(customerElectronicCard);
+        CustomerCardSetting customerCardSetting = new CustomerCardSetting();
+        customerCardSetting.setStationId(request.getStationId());
+        if(stationInfos.getCardRuleFlag().equals("1")){
+            //表示共享则使用集团ID为查询条件
+            customerCardSetting.setStationId(stationInfos.getGroupId());
+        }
+        List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
+        if(cardRechargeSettingList !=null && cardRechargeSettingList.size() >0){
+            String cardOilsTypeStr = cardRechargeSettingList.get(0).getCardOilsType();
+            String[] split = cardOilsTypeStr.split(",");
+            for(int i=0; i<split.length; i++){
+                customerElectronicCard.setCardOilsType(String.valueOf(split[i]));   //卡的类型
+                List<CustomerElectronicCard> electronicCardList = electronicMembershipCardService.getElectronicCardList(customerElectronicCard);
+                if(electronicCardList !=null && electronicCardList.size() ==1){
+                    electronicMembershipCardService.updateElectronicCardInfoByUnionId(customerElectronicCard);
+                }else {
+                    String currentTime = String.valueOf(System.currentTimeMillis());
+                    String customerNo = request.getStationId() + currentTime;
+                    customerElectronicCard.setCustomerNo(customerNo);
+                    customerElectronicCard.setAmt(new BigDecimal(0));
+                    electronicMembershipCardService.insetElectronicCard(customerElectronicCard);
+                }
+            }
         }
-
     }
 
 }

YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -95,68 +95,6 @@ public class ElectronicMembershipCardController {
             stationInfo.setStationId(stationId);
             StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
             if(stationInfos.getCardEnabledFlag().equals("1")){
-//                //1.获取当前油站所开启的电子卡种类
-//                CustomerCardSetting customerCardSetting = new CustomerCardSetting();
-//                customerCardSetting.setStationId(stationId);
-//                if(stationInfos.getCardRuleFlag().equals("1")){
-//                    //集团下油站共享充值规则
-//                    customerCardSetting.setStationId(stationInfos.getGroupId());
-//                }
-//                List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
-//                if(cardRechargeSettingList !=null && cardRechargeSettingList.size() >0){
-//                    //2.获取油站开卡的种类
-//                    String cardOilsType = cardRechargeSettingList.get(0).getCardOilsType();
-//                    String[] cardOilsTypeArray = cardOilsType.split(",");
-//
-//                    //2.1查询客户现已拥有的电子卡
-//                    CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
-//                    customerElectronicCard.setStationId(customerCardSetting.getStationId());
-//                    customerElectronicCard.setUnionId(unionId);
-//                    String[] cardTypesArray = {};
-//                    List<String> hasCard = Arrays.asList(cardTypesArray);
-//                    List<CustomerElectronicCard> electronicCardList = electronicMembershipCardService.getElectronicCardList(customerElectronicCard);
-//                    for(CustomerElectronicCard c : electronicCardList){
-//                        hasCard.add(c.getCardOilsType());
-//                    }
-//                    List<String> cardOilsTypeArrayList = Arrays.asList(cardOilsTypeArray);
-//                    //2.2获取客户要新增的电子卡
-//                    for (int i=0; i<cardOilsTypeArrayList.size(); i++){
-//                        for (int y=0; y< hasCard.size(); y++){
-//                            if(cardOilsTypeArrayList.get(i).equals(hasCard.get(y))){
-//                                cardOilsTypeArrayList.remove(i);
-//                            }
-//                        }
-//                    }
-//                    //3.依次生成该用户的电子卡
-//                    System.out.println(cardOilsTypeArrayList);
-//                    AppUserInfo appUserInfo = new AppUserInfo();
-//                    appUserInfo.setStationId(stationId);
-//                    appUserInfo.setUnionId(unionId);
-//
-//                    List<AppUserInfo> userInfo = appUserInfoService.getUserInfo(appUserInfo);
-//                    if(userInfo !=null  ){
-//
-//                    }
-//                    List<CustomerElectronicCard> listParam = new ArrayList<>();
-//                    for(int i =0; i<cardOilsTypeArrayList.size(); i++){
-//                        CustomerElectronicCard c = new CustomerElectronicCard();
-//                        c.setStationId(stationId);
-//                        c.setUnionId(unionId);
-//                        c.setCreateTime(new Date());
-//                        c.setAmt(new BigDecimal(0));
-//                        c.setCardOilsType(cardOilsTypeArrayList.get(i));
-//                        //c.setBlogOpenid();
-//                        //c.setCustomerNo();
-//                        //c.setMobilePhone();
-//                        //c.setMinaOpenid();
-//                        listParam.add(c);
-//                    }
-//                    //3.1批量插入
-//
-//
-//                }
-
-
                 CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
                 customerElectronicCard.setStationId(stationId);
                 customerElectronicCard.setUnionId(unionId);
@@ -350,6 +288,7 @@ public class ElectronicMembershipCardController {
                 String mobilePhone =resultMap.get("mobilePhone").toString();
                 String unionId =resultMap.get("unionId").toString();
                 String minaOpenid =resultMap.get("minaOpenid").toString();
+                String blogOpenid =resultMap.get("blogOpenid").toString();
                 String consumerId =resultMap.get("consumerId").toString();
                 String registeDate =resultMap.get("registeDate").toString();
                 String stationName =resultMap.get("stationName").toString();
@@ -418,9 +357,6 @@ public class ElectronicMembershipCardController {
                     Map<String, Object> params_1 = new HashMap<>();
                     params_1.put("stationId", stationId);
                     params_1.put("oilName", oilName);
-                    //获取该油站的优惠方式
-//                    String discountPlanType = stationService.getStationDiscountWay(stationId);
-//                    logger.info("油站优惠方式："+discountPlanType);
                     //获取客户会员信息
                     CustomerManage customerManageInfo = customerManagerService.getCustomerManageInfo(customerManage);
                     customerManage.setGroupId(Integer.valueOf(groupId));
@@ -438,7 +374,6 @@ public class ElectronicMembershipCardController {
                         List<Map> customerGradeInfo = customerGradeServices.getCustomerGradeListOrderByDesc(params_1);  //直降
                         logger.info("该站直降等级信息："+ customerGradeInfo);
                         for (Map m: customerGradeInfo){
-                            //&& Double.valueOf(customerManage.getAmt().toString()) < Double.valueOf(m.get("memberConditEnd").toString())
                             if(Double.valueOf(customerManage.getAmt().toString()) >= Double.valueOf(m.get("memberConditStart").toString())){
                                 customerManage.setGrade(m.get("grade").toString());     //存入等级名称
                                 customerManage.setMemberGrade(m.get("id").toString());     //存入等级ID
@@ -482,7 +417,7 @@ public class ElectronicMembershipCardController {
                     }
 
                     //电子卡消费公众号通知
-                    if(cardInfo.getBlogOpenid() !=null){
+                    if(blogOpenid !=null){
                         String gzhAppId ="";
                         String gzhAppSecret ="";
                         Map<String, String> m = stationService.getStationAppIdAndAppSecret(cardInfo.getStationId());
@@ -492,7 +427,7 @@ public class ElectronicMembershipCardController {
                             gzhAppSecret = m.get("gzhAppSecret");
                             //推送模板
                             List<WxMpTemplateData> wxMpTemplate = new ArrayList<>();
-                            wxMpTemplate.add(new WxMpTemplateData("first","尊敬的"+cardInfo.getCustomerName()+"，您好：\n" + "您在"+stationName+"的最新消费交易信息如下"));
+                            wxMpTemplate.add(new WxMpTemplateData("first","尊敬的"+consumer+"，您好：\n" + "您在"+stationName+"的最新消费交易信息如下"));
                             wxMpTemplate.add(new WxMpTemplateData("keyword1", new SimpleDateFormat("yyyy年MM月dd日HH时mm分").format(new Date())));
                             wxMpTemplate.add(new WxMpTemplateData("keyword2", stationName));
                             wxMpTemplate.add(new WxMpTemplateData("keyword3", oilName));
@@ -504,7 +439,7 @@ public class ElectronicMembershipCardController {
                             gzhNewsTemplate.setTemplateType("5");
                             GzhNewsTemplate gzhNewsTemplateInfo = gzhNewsTemplateService.getGzhNewsTemplate(gzhNewsTemplate);
                             if(gzhNewsTemplateInfo !=null && gzhNewsTemplateInfo.getTemplateId() !=null){
-                                wxPushUtil.push(gzhAppId, gzhAppSecret, gzhNewsTemplateInfo.getTemplateId(), cardInfo.getBlogOpenid(), wxMpTemplate);
+                                wxPushUtil.push(gzhAppId, gzhAppSecret, gzhNewsTemplateInfo.getTemplateId(), blogOpenid, wxMpTemplate);
                             }
                         }
                     }
@@ -525,6 +460,7 @@ public class ElectronicMembershipCardController {
                         calculateIntegral.setStationId(Integer.valueOf(stationId));                     //油站ID
                         calculateIntegral.setUnionId(unionId);                                          //客户UnionID
                         calculateIntegral.setOpenId(minaOpenid);                                        //小程序openId
+                        calculateIntegral.setBlogOpenid(blogOpenid);                                    //公众号openId
                         CalculateIntegral calculateIntegralInfo = this.calculateIntegral(calculateIntegral);    //计算积分
                         integral = calculateIntegralInfo.getIntegral(); //赋值积分
                         CustomerPoints customerPoints = this.insertUserIntegral(calculateIntegralInfo); //插入客户积分信息
@@ -849,7 +785,7 @@ public class ElectronicMembershipCardController {
                 logger.info("=================================电子会员卡（储蓄卡）充值功能调用随行付接口================================");
                 try {
                     if(userType.equals("1")){
-                        //1 是公众号
+                        //1 是微信公众号
                         reqData.put("payWay", "02"); //支付方式  02 公众号/服 务窗/js支付 03 小程序
                         reqData.put("userId", openId); //用户号 微信：openid； 支付宝：userid；银联：userid；微信&支付宝必传，银联js为非必传
                         reqData.put("subAppid", resultMap.get("gzhAppId")); //微信公众号
@@ -1077,10 +1013,8 @@ public class ElectronicMembershipCardController {
                 CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
                 customerElectronicCard.setUnionId(customerCardUseRecordInfo.getUnionId());
                 customerElectronicCard.setStationId(customerCardUseRecordInfo.getStationId());
-                //customerCardUseRecord.setStationId(customerCardUseRecordInfo.getStationId());
                 //是否有赠送金额
                 BigDecimal presentAmt =new BigDecimal(0);
-                //BigDecimal cardSumAmt = null;
                 if(customerCardUseRecordInfo.getPresentAmt() !=null){
                     presentAmt = customerCardUseRecordInfo.getPresentAmt();  //客户充值赠送金额
                     logger.info("客户充值赠送金额：" +presentAmt.toString());
@@ -1121,7 +1055,9 @@ public class ElectronicMembershipCardController {
                         logger.info("推送消息的油站ID："+ gzhNewsTemplateInfo.getStationId().toString());
                         logger.info("当前要推送消息所用使用的模板ID："+ gzhNewsTemplateInfo.getTemplateId());
                         List<WxMpTemplateData> wxMpTemplate = new ArrayList<>();
-                        String cardName = customerCardUseRecordInfo.getCardOilsType().equals("1")? "汽油":"柴油";
+                        Oil oil = new Oil();
+                        oil.setOilsType(customerCardUseRecordInfo.getCardOilsType());
+                        String cardName =sysDictDataService.selectOilType(oil).getOilName();
                         wxMpTemplate.add(new WxMpTemplateData("first","尊敬的"+customerName+"，您好：\n" + "您在"+stationName+"的"+cardName+"电子会员卡充值成功信息如下"));
                         wxMpTemplate.add(new WxMpTemplateData("keyword1", customerNo));
                         wxMpTemplate.add(new WxMpTemplateData("keyword2", amt + " 元"));
@@ -1475,6 +1411,7 @@ public class ElectronicMembershipCardController {
         customerPoints.setRecentlyPoints(calculateIntegral.getIntegral());  //用户当前所获得的积分
         customerPoints.setStationId(calculateIntegral.getStationId());  //油站ID
         customerPoints.setMinaOpenId(calculateIntegral.getOpenId());    //用户小程序ID
+        customerPoints.setBlogOpenId(calculateIntegral.getBlogOpenid());    //公众号ID
         customerPoints.setUnionId(calculateIntegral.getUnionId());      //用户unionId
         //获取客户积分信息
         CustomerPoints customerPointsInfo = customerPointsService.getCustomerPointsInfoByUnionId(customerPoints);

YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -160,11 +160,12 @@ public class PayController {
         //订单类型 是小程序还是公众号
         appUserInfo.setUserType(userType);
         if(userType.equals("1")){
-            //1 是公众号
-            appUserInfo.setBlogOpenid(openId);
-        }else if(userType.equals("2")){
-            //2是小程序
+            //1 是微信
+            //appUserInfo.setBlogOpenid(openId);
             appUserInfo.setMinaOpenid(openId);
+        }else if(userType.equals("2")){
+            //2是支付宝
+            appUserInfo.setALiId(openId);
         }
         List<AppUserInfo> appUserInfoList =appUserInfoService.Authentication(appUserInfo);
         if(appUserInfoList!=null&&appUserInfoList.size()==1){
@@ -182,27 +183,26 @@ public class PayController {
                     //reqData.put("amt", "0.01");
                     //reqData.put("discountAmt", ""); //参与优惠金额
                     //reqData.put("unDiscountAmt", ""); //不参与优惠金额
-                    reqData.put("payType", "WECHAT"); //支付渠道
+                    reqData.put("payType", "WECHAT"); //支付渠道 WECHAT：微信；ALIPAY:支付宝；UNIONPAY:银联
                     Map<String, String> stationAppIdAndAppSecret = stationService.getStationAppIdAndAppSecret(Integer.valueOf(payInfoRequest.getStationId()));
                     if(stationAppIdAndAppSecret !=null && stationAppIdAndAppSecret.containsKey("appId") && stationAppIdAndAppSecret.containsKey("mno")){
                         if(userType.equals("1")){
-                            reqData.put("subAppid", stationAppIdAndAppSecret.get("gzhAppId")); //微信公众号
-                            logger.info("支付子商户："+ stationAppIdAndAppSecret.get("gzhAppId"));
-                        }else if(userType.equals("2")){
                             reqData.put("subAppid", stationAppIdAndAppSecret.get("appId")); //微信小程序
                             logger.info("支付子商户："+ stationAppIdAndAppSecret.get("appId"));
+                        }else if(userType.equals("2")){
+                            reqData.put("subAppid", stationAppIdAndAppSecret.get("aliAppId")); //支付宝小程序
+                            logger.info("支付子商户："+ stationAppIdAndAppSecret.get("aliAppId"));
                         }
                         reqData.put("mno", stationAppIdAndAppSecret.get("mno")); //商户编号
                         logger.info("商户编号："+ stationAppIdAndAppSecret.get("mno"));
                     }
                     if(userType.equals("1")){
-                        //1 是公众号
-                        reqData.put("payWay", "02"); //支付方式  02 公众号/服 务窗/js支付 03 小程序
-                        reqData.put("userId", appUserInfoList.get(0).getBlogOpenid()); //用户号 微信：openid； 支付宝：userid；银联：userid；微信&支付宝必传，银联js为非必传
-                    }else if(userType.equals("2")){
-                        //2是小程序
+                        //1 是微信小程序
                         reqData.put("payWay", "03"); //支付方式  02 公众号/服 务窗/js支付 03 小程序
                         reqData.put("userId", appUserInfoList.get(0).getMinaOpenid()); //用户号 微信：openid； 支付宝：userid；银联：userid；微信&支付宝必传，银联js为非必传
+                    }else if(userType.equals("2")){
+                        reqData.put("payWay", "03"); //支付方式  02 公众号/服 务窗/js支付 03 小程序
+                        reqData.put("userId", appUserInfoList.get(0).getALiId()); //用户号 微信：openid； 支付宝：userid；银联：userid；微信&支付宝必传，银联js为非必传
                     }
                     //reqData.put("timeExpire", "10"); //订单失效时间, 以分钟为单位
                     //reqData.put("limitPay", "00"); //限制卡类型: 00-全部 01-限定不能使 用信用卡支付 默认值 00
@@ -550,7 +550,11 @@ public class PayController {
                     PayOrder payOrder = new PayOrder();
                     payOrder.setOrderNo(ordNo);
                     payOrder.setStatus("1");
-                    payOrder.setPayType("wx");
+                    if(payType.equals("WECHAT")){   //WECHAT:微信,ALIPAY:支付宝,UNIONPAY:
+                        payOrder.setPayType("wx");
+                    }else if(payType.equals("ALIPAY")){
+                        payOrder.setPayType("zfb");
+                    }
                     payOrder.setWxAmt(Double.valueOf(amt));
                     payOrder.setPayDate(new Timestamp(new Date().getTime()));    //支付时间
                     payOrder.setReceivedAmt(Double.valueOf(settleAmt)); //settleAmt商家入账金额

YijiaRestful/src/main/java/com/platform/yijia/pojo/CalculateIntegral.java

@@ -15,6 +15,7 @@ public class CalculateIntegral {
     private String oilName;         //油品名称
     private String oilType;         //油类：1.油品； 2.非油品
     private String openId;          //公众号Id
+    private String blogOpenid;      //公众号ID
     private String unionId;         // unionId
     private String nickName;        //客户名
     private String customerGrade;      //客户等级

YijiaRestful/src/main/resources/mapper/AppUserInfoMapper.xml

@@ -521,17 +521,14 @@
       </if>
     </set>
     <where>
-      <if test="userType !=null and userType !=''">
-        user_type = #{userType}
-      </if>
-      <if test="blogOpenid !=null and blogOpenid !=''">
-        AND blog_openid = #{blogOpenid}
+      <if test="stationId !=null and stationId !=''">
+        station_id = #{stationId}
       </if>
-      <if test="minaOpenid !=null and minaOpenid !=''">
-        AND mina_openid = #{minaOpenid}
+      <if test="unionId !=null and unionId !=''">
+        AND union_id = #{unionId}
       </if>
-      <if test="stationId !=null and stationId !=''">
-        AND station_id = #{stationId}
+      <if test="mobilePhone !=null and mobilePhone !=''">
+        AND mobile_phone = #{mobilePhone},
       </if>
     </where>
   </update>

YijiaRestful/src/main/resources/mapper/ElectronicMembershipCardMapper.xml

@@ -116,27 +116,29 @@
     <!--查询客户充值的订单信息-->
     <select id="getCardRecordByOrderNo" parameterType="com.platform.yijia.pojo.CustomerCardUseRecord" resultMap="CardRecordBaseResultMap">
         SELECT
-            id,
-            order_no,
-            union_id,
-            ali_id,
-            customer_name,
-            mobile_phone,
-            usage_type,
-            pay_type,
-            card_oils_type,
-            amt,
-            balance,
-            present_amt,
-            create_time,
-            station_id,
-            station_name,
-            status
+            T1.id,
+            T1.order_no,
+            T1.union_id,
+            T1.ali_id,
+            T2.blog_nick_name           AS customer_name,
+            T2.mobile_phone,
+            T1.usage_type,
+            T1.pay_type,
+            T1.card_oils_type,
+            T1.amt,
+            T1.balance,
+            T1.present_amt,
+            T1.create_time,
+            T1.station_id,
+            T3.station_name,
+            T1.status
         FROM
-            customer_card_use_record
+            customer_card_use_record    AS T1
+        LEFT JOIN app_user_info         AS T2 ON T1.station_id = T2.station_id AND T1.union_id =T2.union_id
+        LEFT JOIN sys_dept              AS T2 ON T1.station_id = T3.station_id
         <where>
             <if test=" orderNo !=null and orderNo !=''">
-                order_no = #{orderNo}
+                T1.order_no = #{orderNo}
             </if>
         </where>
     </select>

YijiaRestful/src/main/resources/mapper/StationInfoMapper.xml

@@ -548,7 +548,11 @@
       app_id          AS appId,
       app_secret      AS appSecret,
       gzh_app_id      AS gzhAppId,
-      gzh_app_secret  AS gzhAppSecret
+      gzh_app_secret  AS gzhAppSecret,
+      ali_app_id      AS aliAppId,
+      ali_public_key  AS aliPublicKey,
+      ali_private_key AS aliPrivateKey,
+      ali_encrypt_key AS aliEncryptKey
     FROM
         sys_dept
     <where>

YijiaRestful/src/test/java/com/palatform/yijia/test.java

@@ -13,22 +13,30 @@ public class test {
 
     public static void main(String[] args) {
 
-        List<String> hasCard = new ArrayList<>();
-        hasCard.add("1");
-        hasCard.add("3");
-        List<String> splitList = new ArrayList<>();
-        splitList.add("1");
-        splitList.add("2");
-        splitList.add("3");
-        splitList.add("4");
-        for (int i=0; i<splitList.size(); i++){
-            for (int y=0; y< hasCard.size(); y++){
-                if(splitList.get(i).equals(hasCard.get(y))){
-                    splitList.remove(i);
-                }
-            }
+//        List<String> hasCard = new ArrayList<>();
+//        hasCard.add("1");
+//        hasCard.add("3");
+//        List<String> splitList = new ArrayList<>();
+//        splitList.add("1");
+//        splitList.add("2");
+//        splitList.add("3");
+//        splitList.add("4");
+//        for (int i=0; i<splitList.size(); i++){
+//            for (int y=0; y< hasCard.size(); y++){
+//                if(splitList.get(i).equals(hasCard.get(y))){
+//                    splitList.remove(i);
+//                }
+//            }
+//        }
+//        System.out.println(hasCard);
+
+
+        String cardOilsTypeStr = "1";
+        String[] split = cardOilsTypeStr.split(",");
+        for (int i=0; i<split.length; i++){
+            System.out.println(split[i]);
         }
-        System.out.println(hasCard);
+