修改

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

@@ -100,28 +100,29 @@ public class ElectronicMembershipCardController {
             stationInfo.setStationId(stationId);
             StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
             List<CustomerElectronicCard> electronicCardList = new ArrayList<>();
-            if(stationInfos.getCardEnabledFlag().equals("1")){
-                CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
-                customerElectronicCard.setStationId(stationId);
-                customerElectronicCard.setUnionId(unionId);
-
-                CustomerCardSetting customerCardSetting = new CustomerCardSetting();
-                customerCardSetting.setStationId(stationId);
-                if(stationInfos.getCardRuleFlag().equals("1")){ //card_rule_flag 是否共享积分规则
+            CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
+            CustomerCardSetting customerCardSetting = new CustomerCardSetting();
+            if(stationInfos.getCardEnabledFlagGroup().equals("1")){
+                if(stationInfos.getCardEnabledFlagGroup().equals("1")){
+                    customerElectronicCard.setUnionId(unionId);
                     customerCardSetting.setStationId(stationInfos.getGroupId());
                     customerElectronicCard.setStationId(stationInfos.getGroupId());
                 }
-                List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
-                if(cardRechargeSettingList !=null && cardRechargeSettingList.size() >0){
-                    String cardOilsType = cardRechargeSettingList.get(0).getCardOilsType();
-                    String[] split = cardOilsType.split(",");
-                    customerElectronicCard.setCardOilsTypeArray(split);
-                }
-                electronicCardList = electronicMembershipCardService.getElectronicCardListBycardOilsTypeArray(customerElectronicCard);
-                resultData = ResultData.success(electronicCardList);
             }else {
-                resultData = ResultData.success(electronicCardList);
+                if(stationInfos.getCardEnabledFlag().equals("1")){
+                    customerCardSetting.setStationId(stationId);
+                    customerCardSetting.setStationId(stationInfos.getStationId());
+                    customerElectronicCard.setStationId(stationInfos.getStationId());
+                }
+            }
+            List<CustomerCardSetting> cardRechargeSettingList = electronicMembershipCardService.getCardRechargeSettingList(customerCardSetting);
+            if(cardRechargeSettingList !=null && cardRechargeSettingList.size() >0){
+                String cardOilsType = cardRechargeSettingList.get(0).getCardOilsType();
+                String[] split = cardOilsType.split(",");
+                customerElectronicCard.setCardOilsTypeArray(split);
             }
+            electronicCardList = electronicMembershipCardService.getElectronicCardListBycardOilsTypeArray(customerElectronicCard);
+            resultData = ResultData.success(electronicCardList);
         }else {
             resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
         }
@@ -157,17 +158,17 @@ public class ElectronicMembershipCardController {
             logger.info("油站ID："+stationId);
             logger.info("充值unionId："+unionId);
             //是否启用电子卡功能
-            if(stationInfos.getCardEnabledFlag() !=null && stationInfos.getCardEnabledFlag().equals("1")){
+            //if(stationInfos.getCardEnabledFlag() !=null && stationInfos.getCardEnabledFlagGroup().equals("1")){
                 CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();      //电子会员卡使用记录
                 CustomerCardSetting customerCardSetting = new CustomerCardSetting();        //电子卡优惠规则设置
                 customerCardSetting.setStationId(stationId);
                 AppUserInfo appUserInfo = new AppUserInfo();
+                //appUserInfo.setStationId(stationInfos.getGroupId());
                 appUserInfo.setStationId(stationInfos.getGroupId());
-//                if(stationInfos.getCardRuleFlag().equals("1")){
-//                    //如果油站充值规则共享
-//                    customerCardSetting.setStationId(stationInfos.getGroupId());
-//                    appUserInfo.setStationId(stationInfos.getGroupId());
-//                }
+                if(stationInfos.getCardRuleFlagGroup().equals("1")){
+                    //如果油站充值规则共享
+                    customerCardSetting.setStationId(stationInfos.getGroupId());
+                }
                 appUserInfo.setUnionId(unionId);
 
                 AppUserInfo appUserInfoPhone = appUserInfoService.getAppUserInfo(appUserInfo);
@@ -284,6 +285,9 @@ public class ElectronicMembershipCardController {
                 CustomerElectronicCard c = new CustomerElectronicCard();    //电子会员卡
                 c.setUnionId(unionId);
                 c.setStationId(stationId);
+                if(stationInfos.getCardEnabledFlagGroup().equals("1")){
+                    c.setStationId(stationInfos.getGroupId());
+                }
                 c.setCardOilsType(cardOilsType);
                 CustomerElectronicCard electronicCardInfoByUnionId = electronicMembershipCardService.getElectronicCardInfoByUnionId(c);
                 if(electronicCardInfoByUnionId !=null && electronicCardInfoByUnionId.getCustomerNo() !=null){
@@ -301,7 +305,7 @@ public class ElectronicMembershipCardController {
                 logger.info("电子卡的充值单号：" +orderNo);
                 electronicMembershipCardService.insetCardUseRecordRecharge(customerCardUseRecord);      //插入电子会员卡的使用记录
                 resultData = ResultData.success(orderNo);
-            }
+            //}
         }
         return gson.toJson(resultData);
     }
@@ -1091,7 +1095,17 @@ public class ElectronicMembershipCardController {
                 logger.info("充值单号：" + ordNo);
                 CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
                 customerElectronicCard.setUnionId(customerCardUseRecordInfo.getUnionId());
+                //获取油站是否开启共享
+                StationInfo stationInfo = new StationInfo();
+                AppUserInfo appUserInfo = new AppUserInfo();
+                stationInfo.setStationId(customerCardUseRecordInfo.getStationId());
+                StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
                 customerElectronicCard.setStationId(customerCardUseRecordInfo.getStationId());
+                appUserInfo.setStationId(stationInfos.getGroupId());
+                appUserInfo.setUnionId(customerCardUseRecordInfo.getUnionId());
+                if(stationInfos.getCardRuleFlagGroup().equals("1")){
+                    customerElectronicCard.setStationId(stationInfos.getGroupId());
+                }
                 //是否有赠送金额
                 BigDecimal presentAmt =new BigDecimal(0);
                 if(customerCardUseRecordInfo.getPresentAmt() !=null){
@@ -1155,10 +1169,13 @@ public class ElectronicMembershipCardController {
                         if(m !=null && m.containsKey("gzhAppId") && m.containsKey("gzhAppSecret")){
                             String gzhAppId = m.get("gzhAppId");
                             String gzhAppSecret = m.get("gzhAppSecret");
-                            if(customerCardUseRecordInfo.getBlogOpenid() !=null){
-                                wxPushUtil.push(gzhAppId, gzhAppSecret, gzhNewsTemplateInfo.getTemplateId(), blogOpenid, wxMpTemplate);
-                                logger.info("结束微信公众号电子会员卡消息推送成功，推送人："+ blogOpenid);
-                                logger.info("===================================本次电子卡充值流程结束===========================================");
+                            AppUserInfo appUserInfos = appUserInfoService.getAppUserInfo(appUserInfo);
+                            if(appUserInfos !=null){
+                                if(StringUtils.isNotBlank(appUserInfos.getBlogOpenid())){
+                                    wxPushUtil.push(gzhAppId, gzhAppSecret, gzhNewsTemplateInfo.getTemplateId(), appUserInfos.getBlogOpenid(), wxMpTemplate);
+                                    logger.info("结束微信公众号电子会员卡消息推送成功，推送人："+ appUserInfos.getBlogOpenid());
+                                    logger.info("===================================本次电子卡充值流程结束===========================================");
+                                }
                             }
                         }
                     }
@@ -1186,12 +1203,13 @@ public class ElectronicMembershipCardController {
             StationInfo stationInfo = new StationInfo();
             stationInfo.setStationId(stationId);
             StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
-            if(stationInfos.getCardRuleFlag() !=null && stationInfos.getCardRuleFlag().equals("1")){
+            if(stationInfos.getCardRuleFlagGroup() !=null && stationInfos.getCardRuleFlagGroup().equals("1")){
                 //如果集团充值规则共享
                 customerCardUseRecord.setGroupId(stationInfos.getGroupId());
             }else {
                 customerCardUseRecord.setStationId(stationId);
             }
+            //customerCardUseRecord.setStationId(stationId);
             customerCardUseRecord.setUnionId(unionId);
             List<CustomerCardUseRecord> cardUseRecordList = electronicMembershipCardService.getCardUseRecordList(customerCardUseRecord);
             resultData = ResultData.success(cardUseRecordList);

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

@@ -160,7 +160,7 @@ public class IntegralShoppingMallController {
             StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
             integralOrder.setStationId(request.getStationId());
             customerPoints.setStationId(request.getStationId());
-            if(stationInfos.getIntegralRuleFlag()!=null && stationInfos.getIntegralRuleFlag().equals("1")){ //如果积分规则共享
+            if(stationInfos.getIntegralRuleFlagGroup()!=null && stationInfos.getIntegralRuleFlagGroup().equals("1")){ //如果积分规则共享
                 customerPoints.setStationId(stationInfos.getGroupId());
             }
             customerPointsRecord.setStationId(request.getStationId());
@@ -422,6 +422,12 @@ public class IntegralShoppingMallController {
             CustomerPoints customerPoints  =new CustomerPoints();
             customerPoints.setUnionId(unionId);
             customerPoints.setStationId(stationId);
+            StationInfo stationInfo = new StationInfo();
+            stationInfo.setStationId(stationId);
+            StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
+            if(stationInfos.getIntegralRuleFlagGroup().equals("1")){
+                customerPoints.setStationId(stationInfos.getGroupId());
+            }
             CustomerPoints customerPointsInfo = customerPointsService.getCustomerPointsInfo(customerPoints);
             resultData=ResultData.success(customerPointsInfo);
         }else {
@@ -491,6 +497,12 @@ public class IntegralShoppingMallController {
         if(stationId !=null){
             IntegralRule integralRule = new IntegralRule();
             integralRule.setStationId(stationId);
+            StationInfo stationInfo = new StationInfo();
+            stationInfo.setStationId(stationId);
+            StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
+            if(stationInfos.getIntegralRuleFlagGroup().equals("1")){
+                integralRule.setStationId(stationInfos.getGroupId());
+            }
             integralRule.setEmptyDate(new Date()); //有效期时间是否大于当前时间
             List<IntegralRule> integralRuleList = integralRuleService.getIntegralRule(integralRule);
             resultData=ResultData.success(integralRuleList);