修改

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

@@ -450,6 +450,7 @@ public class ElectronicMembershipCardController {
                     StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
                     if(stationInfos !=null && stationInfos.getIntegralFlag().equals("1")){
                         CalculateIntegral calculateIntegral = new CalculateIntegral();
+                        calculateIntegral.setOrderNo(ordNo);                                            //订单号
                         calculateIntegral.setCustomerGrade(customerManage.getGrade());                  //客户等级
                         calculateIntegral.setIntegralRuleFlag(stationInfos.getIntegralRuleFlag());      //是否共享积分
                         calculateIntegral.setAmt(new BigDecimal(amt));                                  //客户实收金额
@@ -1426,6 +1427,7 @@ public class ElectronicMembershipCardController {
             customerPointsRecord.setRecordType("+");
             customerPointsRecord.setUnionId(customerPointsInfo.getUnionId());
             customerPointsRecord.setIntegral(calculateIntegral.getIntegral());
+            customerPointsRecord.setOrderNo(calculateIntegral.getOrderNo());
             //插入客户记录表
             customerPointsRecordService.insertCustomerPointsRecordInfo(customerPointsRecord);
 
@@ -1450,6 +1452,7 @@ public class ElectronicMembershipCardController {
             customerPointsRecord.setRecordType("+");
             customerPointsRecord.setUnionId(calculateIntegral.getUnionId());
             customerPointsRecord.setIntegral(calculateIntegral.getIntegral());
+            customerPointsRecord.setOrderNo(calculateIntegral.getOrderNo());
             customerPointsRecordService.insertCustomerPointsRecordInfo(customerPointsRecord);
 
             customerPoints.setUnionId(calculateIntegral.getUnionId());

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

@@ -211,6 +211,7 @@ public class IntegralShoppingMallController {
                         //插入客户记录表
                         customerPointsRecord.setRecordType("-");    //客户积分表记录
                         customerPointsRecord.setCreateTime(new Date());
+                        customerPointsRecord.setOrderNo(integralOrderNo);
                         //插入客户积分记录
                         customerPointsRecordService.insertCustomerPointsRecordInfo(customerPointsRecord);
 

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

@@ -48,14 +48,10 @@ public class PayController {
     @Resource
     private CustomerPointsRecordService customerPointsRecordService;
     @Resource
-    private RedisCacheUtil redisCacheUtil;
-    @Resource
     private WxPushUtil wxPushUtil;
     @Resource
     private GzhNewsTemplateService gzhNewsTemplateService;
     @Resource
-    private  ElectronicMembershipCardService electronicMembershipCardService;
-    @Resource
     private  CustomerManagerService customerManagerService;
     @Value("${yijia.path.global-prefix}")
     private String globalPrefix;
@@ -183,7 +179,7 @@ public class PayController {
                     //reqData.put("amt", "0.01");
                     //reqData.put("discountAmt", ""); //参与优惠金额
                     //reqData.put("unDiscountAmt", ""); //不参与优惠金额
-                    reqData.put("payType", "WECHAT"); //支付渠道 WECHAT：微信；ALIPAY:支付宝；UNIONPAY:银联
+                    //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")){
@@ -201,6 +197,7 @@ public class PayController {
                         reqData.put("payWay", "03"); //支付方式  02 公众号/服 务窗/js支付 03 小程序
                         reqData.put("userId", appUserInfoList.get(0).getMinaOpenid()); //用户号 微信：openid； 支付宝：userid；银联：userid；微信&支付宝必传，银联js为非必传
                     }else if(userType.equals("2")){
+                        //2 是支付宝
                         reqData.put("payWay", "03"); //支付方式  02 公众号/服 务窗/js支付 03 小程序
                         reqData.put("userId", appUserInfoList.get(0).getALiId()); //用户号 微信：openid； 支付宝：userid；银联：userid；微信&支付宝必传，银联js为非必传
                     }
@@ -538,7 +535,7 @@ public class PayController {
         if (RSASignature.doCheck(resultStr, sign, SXFPaySign.sxfPublic)) {
             logger.info("验签成功");
             req.put("code","success");
-            req.put("msg","成功");
+            req.put("msg","修改订单状态成功");
             logger.info("返回随行付参数信息："+req.toString());
             //验签成功，修改订单状态
             List<PayOrder> list = payOrderService.getPayOrderList(ordNo);
@@ -573,6 +570,7 @@ public class PayController {
                             int integral =0;
                             if(stationInfos !=null && stationInfos.getIntegralFlag().equals("1")){                             //是否启用积分功能
                                 CalculateIntegral calculateIntegral = new CalculateIntegral();
+                                calculateIntegral.setOrderNo(ordNo);
                                 calculateIntegral.setGroupId(Integer.valueOf(infoMap.get("groupId").toString()));               //集团ID
                                 calculateIntegral.setCustomerGrade(customerManage.getGrade());                                  //客户等级
                                 calculateIntegral.setIntegralRuleFlag(stationInfos.getIntegralRuleFlag());                      //是否共享积分规则
@@ -1300,6 +1298,7 @@ public class PayController {
             customerPointsRecord.setRecordType("+");
             customerPointsRecord.setUnionId(customerPointsInfo.getUnionId());
             customerPointsRecord.setIntegral(calculateIntegral.getIntegral());
+            customerPointsRecord.setOrderNo(calculateIntegral.getOrderNo());
             //插入客户记录表
             customerPointsRecordService.insertCustomerPointsRecordInfo(customerPointsRecord);
 
@@ -1324,6 +1323,7 @@ public class PayController {
             customerPointsRecord.setRecordType("+");
             customerPointsRecord.setUnionId(calculateIntegral.getUnionId());
             customerPointsRecord.setIntegral(calculateIntegral.getIntegral());
+            customerPointsRecord.setOrderNo(calculateIntegral.getOrderNo());
             customerPointsRecordService.insertCustomerPointsRecordInfo(customerPointsRecord);
 
             customerPoints.setUnionId(calculateIntegral.getUnionId());

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

@@ -27,4 +27,5 @@ public class CalculateIntegral {
     private BigDecimal oilLiters;       //用户加油的升数
     private BigDecimal receivableAmt;   //用户应收金额
     private String integralRuleFlag;     //是否共享积分规则
+    private String orderNo;             //订单号
 }

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

@@ -17,4 +17,5 @@ public class CustomerPointsRecord {
     private Date createTime;        //创建时间
     private Integer stationId;      //油站ID
     private String stationName;     //油站名称
+    private String orderNo;         //订单号
 }

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

@@ -130,6 +130,15 @@ public class StationInfo {
     private String integralRuleFlag;     //是否共享积分规则
     private String cardRuleFlag;         //是否共享充值规则
     private Integer groupId;             //集团ID
+    private String singleStationFlag;    //'单站是否开启，1是 0否'
+
+    public String getSingleStationFlag() {
+        return singleStationFlag;
+    }
+
+    public void setSingleStationFlag(String singleStationFlag) {
+        this.singleStationFlag = singleStationFlag;
+    }
 
     public Integer getGroupId() {
         return groupId;

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

@@ -11,12 +11,13 @@
     <result column="station_id"      jdbcType="INTEGER"    property="stationId" />
     <result column="station_name"    jdbcType="VARCHAR"    property="stationName" />
     <result column="create_time"     jdbcType="TIMESTAMP"  property="createTime" />
+    <result column="order_no"        jdbcType="VARCHAR"    property="orderNo" />
   </resultMap>
 
   <!--查询列-->
   <sql id="Base_Column_List">
     id, union_id, customer_name, record_type, integral, station_id, station_name,
-    create_time
+    create_time,order_no
   </sql>
 
   <!--查询客户积分记录信息-->
@@ -63,6 +64,9 @@
       <if test="createTime !=null">
         create_time,
       </if>
+      <if test="orderNo !=null">
+        order_no,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="unionId !=null">
@@ -86,6 +90,9 @@
       <if test="createTime !=null">
         #{createTime},
       </if>
+      <if test="orderNo !=null">
+        #{orderNo},
+      </if>
     </trim>
   </insert>
 

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

@@ -21,6 +21,7 @@
     <result column="integral_flag"        jdbcType="VARCHAR" property="integralFlag" />
     <result column="integral_print_flag"  jdbcType="VARCHAR" property="integralPrintFlag" />
     <result column="integral_rule_flag"   jdbcType="VARCHAR" property="integralRuleFlag" />
+    <result column="single_station_flag"  jdbcType="VARCHAR" property="singleStationFlag" />
     <result column="card_rule_flag"       jdbcType="VARCHAR" property="cardRuleFlag" />
     <result column="app_id"               jdbcType="VARCHAR" property="appId" />
     <result column="gzh_app_id"           jdbcType="VARCHAR" property="gzhAppId" />
@@ -103,7 +104,8 @@
         T1.integral_flag,
         T1.integral_print_flag,
         T2.card_rule_flag,
-        T2.integral_rule_flag
+        T2.integral_rule_flag,
+        T2.single_station_flag
     FROM          sys_dept      AS T1
         LEFT JOIN sys_dept      AS T2 ON T1.parent_id = T2.dept_id
     <where>