修改

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

@@ -472,14 +472,6 @@ public class AppUserInfoController {
             customerElectronicCard.setCreateTime(new Date());
             customerElectronicCard.setStationId(request.getStationId());
             customerElectronicCard.setStationName(request.getStationName());
-            StationInfo stationInfo = new StationInfo();
-            stationInfo.setStationId(request.getStationId());
-            //获取油站名称
-            StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
-            if(stationInfos !=null && stationInfos.getStationName() !=null){
-                customerPoints.setStationName(stationInfos.getStationName());
-                customerElectronicCard.setStationName(stationInfos.getStationName());
-            }
 
             if(StringUtils.isNotBlank(request.getSexFlag())){
                 appUserInfo.setSexFlag(request.getSexFlag());
@@ -611,8 +603,6 @@ public class AppUserInfoController {
             }
 
 
-
-
             logger.info("插入数据库用户信息参数："+appUserInfo.toString());
             Map<String, Object> params = new HashMap<>();
             params.put("openId", openId);                   //注册用户openId
@@ -625,15 +615,20 @@ public class AppUserInfoController {
             }else {
                 appUserInfoService.AddAppUserInfo(appUserInfo);
             }
-            StationPayManage stationPayManage = new StationPayManage();
-            stationPayManage.setStationId(request.getStationId());
-            StationPayManage stationPayManageInfo = stationService.selectStationPayManage(stationPayManage);    //换取油站配置信息
+            StationInfo stationInfo = new StationInfo();
+            stationInfo.setStationId(request.getStationId());
+            //获取油站功能信息
+            StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
+            if(stationInfos !=null && stationInfos.getStationName() !=null){
+                customerPoints.setStationName(stationInfos.getStationName());
+                customerElectronicCard.setStationName(stationInfos.getStationName());
+            }
             //是否开起积分功能
-            if(stationPayManageInfo !=null && stationPayManageInfo.getIntegralFlag().equals("1")){
+            if(stationInfos !=null && stationInfos.getIntegralFlag().equals("1")){
                 this.insertCustomerPointsInfo(customerPoints, request);
             }
             //是否开起电子卡功能
-            if(stationPayManageInfo !=null && stationPayManageInfo.getCardEnabledFlag().equals("1")){
+            if(stationInfos !=null && stationInfos.getCardEnabledFlag().equals("1")){
                 this.insertCustomerElectronicCard(customerElectronicCard, request);
             }
             resultData = ResultData.success(CodeMsg.SUCCESS);
@@ -670,6 +665,7 @@ public class AppUserInfoController {
 
     //客户电子会员卡表操作
     public void insertCustomerElectronicCard(CustomerElectronicCard customerElectronicCard, AppUserInfoRequest request){
+
         List<CustomerElectronicCard> electronicCardList = electronicMembershipCardService.getElectronicCardList(customerElectronicCard);
         if(electronicCardList !=null && electronicCardList.size() ==2){
             customerElectronicCard.setCreateTime(null);

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -330,7 +331,7 @@ public class ElectronicMembershipCardController {
                     electronicMembershipCardService.updateElectronicCardInfoByUnionId(c);
                     payOrder.setPayType("dzk");   //支付方式                                                 //支付类型
                     payOrder.setStatus("1");
-                    payOrder.setPayDate(new Date());    //支付时间
+                    payOrder.setPayDate(new Timestamp(new Date().getTime()));    //支付时间
                     payOrder.setReceivedAmt(Double.valueOf(amt));
                     payOrder.setDzkAmt(Double.valueOf(amt));
                     //payOrder.setTransactionId(ordNo);

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -544,7 +545,7 @@ public class PayController {
                     payOrder.setStatus("1");
                     payOrder.setPayType("wx");
                     payOrder.setWxAmt(Double.valueOf(amt));
-                    payOrder.setPayDate(new Date());    //支付时间
+                    payOrder.setPayDate(new Timestamp(new Date().getTime()));    //支付时间
                     payOrder.setReceivedAmt(Double.valueOf(settleAmt)); //settleAmt商家入账金额
                     //修改订单状态
                     int count = payOrderService.getUpdatePayOrder(payOrder);

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

@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.util.*;
 
 @Controller
@@ -88,7 +89,7 @@ public class PayOrderController {
                 payOrder.setScore(payOrderRequest.getScore());                          //积分
                 payOrder.setStationId(payOrderRequest.getStationId());                  //油站id
                 payOrder.setStatus("0");                                                //创建订单 未支付状态 0
-                payOrder.setCreatedDate(new Date());                    //创建时间
+                payOrder.setCreatedDate(new Timestamp(new Date().getTime()));                    //创建时间
                 payOrder.setOrderType(payOrderRequest.getOrderType());  //订单类型
                 payOrder.setOilGun(payOrderRequest.getOilGun());        //油枪号
                 payOrder.setReceivableAmt(payOrderRequest.getReceivableAmt());                //订单应收金额

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

@@ -7,6 +7,7 @@ import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.sql.Timestamp;
 import java.util.Date;
 //@Data
 @Getter
@@ -26,11 +27,11 @@ public class PayOrder implements Serializable {
     private String payType;
     private String payWay;
     //@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date payDate;
+    private Timestamp payDate;
     private String oilPersonnel;
     //@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date createdDate;
+    private Timestamp createdDate;
     private String orderType;
     private String oilPirce;
     private String stationName;

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

@@ -102,7 +102,7 @@
         T1.card_enabled_flag,
         T1.integral_flag,
         T1.integral_print_flag,
-        T1.card_rule_flag,
+        T2.card_rule_flag,
         T2.integral_rule_flag
     FROM          sys_dept      AS T1
         LEFT JOIN sys_dept      AS T2 ON T1.parent_id = T2.dept_id