修改打印条件

YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java

@@ -159,32 +159,67 @@ public class PayOrderServiceImpl implements PayOrderService {
 //            //1 是公众号
 //            appUserInfo.setBlogOpenid(payOrderRequest.getToken());
 //            customerManage.setBlogOpenid(payOrderRequest.getToken());
+//            //customerManage
 //        }else if(payOrderRequest.getUserType().equals("2")){
 //            //2是小程序
 //            appUserInfo.setMinaOpenid(payOrderRequest.getToken());
 //            customerManage.setMinaOpenid(payOrderRequest.getToken());
 //        }
 //
-//        List<AppUserInfo> userInfos = appUserInfoService.Authentication(appUserInfo);
 //        //判断该用户是否已存在
 //        customerManage.setStationId(payOrderRequest.getStationId());
+//        //已存在用户信息 existCustomer
 //        CustomerManage existCustomer = payOrderMapper.isExistCustomer(customerManage);
 //        if(existCustomer != null){  //存在该用户时更新
 //            //判断是汽油还是柴油 用于存放在柴油 汽油 各升数 总额累积值
 //            if(payOrder.getOilType().equals("1")){
-//                BigDecimal sumCyAmt = customerManage.getCyAmt().add(BigDecimal.valueOf(Double.valueOf(payOrderRequest.getAmt())));
-//                customerManage.setCyAmt(sumCyAmt);
-//                BigDecimal sumCyLiters = customerManage.getCyLiters().add(BigDecimal.valueOf(Double.valueOf(payOrder.getOrderLiters())));
-//                customerManage.setCyLiters(sumCyLiters);
+//                //数据库使用decimal 防空处理
+//                //柴油总金额
+//                if(existCustomer.getCyAmt() ==null){
+//                    customerManage.setCyAmt(BigDecimal.valueOf(Double.valueOf(payOrderRequest.getAmt())));
+//                }else{
+//                    BigDecimal sumCyAmt = existCustomer.getCyAmt().add(BigDecimal.valueOf(Double.valueOf(payOrderRequest.getAmt())));
+//                    customerManage.setCyAmt(sumCyAmt);
+//                }
+//                //柴油总升数
+//                if(existCustomer.getCyLiters() ==null){
+//                    customerManage.setCyLiters(BigDecimal.valueOf(Double.valueOf(payOrder.getOrderLiters())));
+//                }else{
+//                    BigDecimal sumCyLiters = existCustomer.getCyLiters().add(BigDecimal.valueOf(Double.valueOf(payOrder.getOrderLiters())));
+//                    customerManage.setCyLiters(sumCyLiters);
+//                }
+//
 //            }else if(payOrder.getOilType().equals("2")) {
-//                BigDecimal sumQyAmt = customerManage.getQyAmt().add(BigDecimal.valueOf(Double.valueOf(payOrderRequest.getAmt())));
-//                customerManage.setQyAmt(sumQyAmt);
-//                BigDecimal sumQyLiters = customerManage.getQyLiters().add(BigDecimal.valueOf(Double.valueOf(payOrder.getOrderLiters())));
-//                customerManage.setQyLiters(sumQyLiters);
+//                //汽油金额
+//                if(existCustomer.getQyAmt() ==null){
+//                    customerManage.setQyAmt(BigDecimal.valueOf(Double.valueOf(payOrderRequest.getAmt())));
+//                }else{
+//                    BigDecimal sumQyAmt = existCustomer.getQyAmt().add(BigDecimal.valueOf(Double.valueOf(payOrderRequest.getAmt())));
+//                    customerManage.setQyAmt(sumQyAmt);
+//                }
+//                //汽油升数
+//                if(existCustomer.getQyLiters() == null){
+//                    customerManage.setQyLiters(BigDecimal.valueOf(Double.valueOf(payOrder.getOrderLiters())));
+//                }else{
+//                    BigDecimal sumQyLiters = existCustomer.getQyLiters().add(BigDecimal.valueOf(Double.valueOf(payOrder.getOrderLiters())));
+//                    customerManage.setQyLiters(sumQyLiters);
+//                }
 //            }
 //            payOrderMapper.updateCustomer(customerManage);
 //        }else{
 //            //不存在时从客户信息表查询插入
+//            List<AppUserInfo> userInfos = appUserInfoService.Authentication(appUserInfo);
+//            if(userInfos.size() == 1 && userInfos !=null){
+//                customerManage.setPhoneNumber(userInfos.get(0).getMobilePhone());
+//                //存入客户表用户表的id
+//                if(userInfos.get(0).getUserType().equals("1")){
+//                    customerManage.setBlogUserId(userInfos.get(0).getUserId());
+//                }else if(userInfos.get(0).getUserType().equals("2")){
+//                    customerManage.setMinaUserId(userInfos.get(0).getUserId());
+//                }
+//                customerManage.setRegtime(userInfos.get(0).getRegisteDate());   //存入注册时间
+//            }
+//            customerManage.setStationName(payOrder.getStationName());   //存入油站名称
 //            if(payOrder.getOilType().equals("1")){
 //                customerManage.setCyAmt(BigDecimal.valueOf(Double.valueOf(payOrderRequest.getAmt())));
 //                customerManage.setCyLiters(BigDecimal.valueOf(Double.valueOf(payOrder.getOrderLiters())));

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

@@ -325,7 +325,7 @@
     FROM  station_device_manage
     <where>
         <if test="oilGunNo != null and oilGunNo !=''">
-          gun_no = #{oilGunNo}
+          FIND_IN_SET(#{oilGunNo}, gun_no)
         </if>
         <if test="stationId != null and stationId !=''">
           AND station_id = #{stationId}