xiugai

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

@@ -335,6 +335,10 @@ public class ElectronicMembershipCardController {
                 String stationId = resultMap.get("stationId").toString();
                 String oilName =resultMap.get("oilName").toString();
                 String mobilePhone =resultMap.get("mobilePhone").toString();
+                String personnelPhone ="";
+                if(resultMap.containsKey("personnelPhone")){
+                    personnelPhone =resultMap.get("personnelPhone").toString();
+                }
                 String unionId =resultMap.get("unionId").toString();
                 String minaOpenid =resultMap.get("minaOpenid").toString();
                 String blogOpenid ="";
@@ -478,7 +482,7 @@ public class ElectronicMembershipCardController {
                         userCoupon_p.setId(Integer.valueOf(id));
                         userCoupon_p.setCreateTime(new Date());
                         userCoupon_p.setVerificationTime(new Date());
-                        userCoupon_p.setMobilePhone(mobilePhone);
+                        userCoupon_p.setMobilePhone(personnelPhone);
                         couponService.updateCouponUserInfo(userCoupon_p);
 
 

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

@@ -992,7 +992,9 @@ public class PayController {
                                         userCoupon.setId(Integer.valueOf(discountCoupon));
                                         userCoupon.setCreateTime(new Date());
                                         userCoupon.setVerificationTime(new Date());
-                                        userCoupon.setMobilePhone(infoMap.get("mobilePhone").toString());
+                                        if(infoMap.containsKey("personnelPhone")){
+                                            userCoupon.setMobilePhone(infoMap.get("personnelPhone").toString());
+                                        }
                                         couponService.updateCouponUserInfo(userCoupon);
 
                                         //更新该优惠券的使用数量

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

@@ -463,6 +463,11 @@ public class PayOrderController {
                         sellPrice = oilPrice.subtract(new BigDecimal(params.get("settlementPrice").toString()));
                         sellAmt = sellPrice.multiply(oilLiters); //优惠价实付金额
                         sellDiscountAmt = receivableAmt.subtract(sellAmt);
+                        if(oilLiters.compareTo(new BigDecimal("1.00")) == -1){
+                            sellPrice = oilPrice;
+                            sellDiscountAmt = oilLiters.multiply(new BigDecimal(params.get("settlementPrice").toString()));
+                            sellAmt = receivableAmt.subtract(sellDiscountAmt);
+                        }
                     }
                     break;
                 case "2":   //折扣
@@ -485,8 +490,12 @@ public class PayOrderController {
                         //司机价
                         discountPrice = sellPrice.subtract(new BigDecimal(params.get("driverPrice").toString()));
                         amt = discountPrice.multiply(oilLiters);
-                        //driverDiscountAmt = sellDiscountAmt.multiply(new BigDecimal("1").subtract(new BigDecimal(params.get("driverPrice").toString()).divide(new BigDecimal("100"))));
                         discountAmt = receivableAmt.subtract(amt);
+                        if(oilLiters.compareTo(new BigDecimal("1.00")) == -1){
+                            discountPrice = sellPrice;
+                            discountAmt = oilLiters.multiply(new BigDecimal(params.get("driverPrice").toString()));
+                            amt = receivableAmt.subtract(discountAmt);
+                        }
                         driverDiscountAmt = discountAmt.subtract(sellDiscountAmt);
                         discountAmt = discountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
                         discountPrice = discountPrice.setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -497,7 +506,6 @@ public class PayOrderController {
                         //司机价
                         discountPrice = sellPrice.multiply(new BigDecimal(params.get("driverPrice").toString())).divide(new BigDecimal("100"));
                         amt = sellAmt.multiply(new BigDecimal(params.get("driverPrice").toString())).divide(new BigDecimal("100"));
-                        //driverDiscountAmt = sellDiscountAmt.multiply(new BigDecimal("1").subtract(new BigDecimal(params.get("driverPrice").toString()).divide(new BigDecimal("100"))));
                         discountAmt = receivableAmt.subtract(amt);
                         driverDiscountAmt = discountAmt.subtract(sellDiscountAmt);
                         discountAmt = discountAmt.setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -540,11 +548,13 @@ public class PayOrderController {
         payOrderResultInfo.setBalance("0");
         String oilName = params.get("oilName").toString();
 
-        Oil oil = new Oil();
-        oil.setDictType("oil");
-        oil.setOilName(oilName);
-        Oil oilInfo = sysDictDataService.selectOilType(oil);
-        payOrderResultInfo.setCardOilsType(oilInfo.getOilsType());
+//        Oil oil = new Oil();
+//        oil.setDictType("oil_name");
+//        oil.setOilName(oilName);
+//        Oil oilInfo = sysDictDataService.selectOilType(oil);
+        //params.put("cardOilsType", payOrderRequest.getCardOilsType());
+        String cardOilsType = params.get("cardOilsType").toString();
+        payOrderResultInfo.setCardOilsType(cardOilsType);
 
         payOrderResultInfo.setOilsCardFlag("0");
         payOrderResultInfo.setCardEnabledFlag("0");

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

@@ -675,7 +675,7 @@ public class PosMachineController {
             if(stationclass.getClassStructureDate()!=null){
                 stationClassesSummary.setEndDate(stationclass.getClassStructureDate());
             }
-            stationClassesSummary.setStationName(stationclass.getStationName());
+            //stationClassesSummary.setStationName(stationclass.getStationName());
             if(stationclass.getStationId()!=null){
                 stationClassesSummary.setStationId(stationclass.getStationId());
             }

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

@@ -1055,11 +1055,13 @@
         B.union_id              AS unionId,
         B.mobile_phone			AS mobilePhone,
         C.dept_name 			AS stationName,
-        C.parent_id             AS groupId
+        C.parent_id             AS groupId,
+        D.personnel_phone       AS personnelPhone
     FROM
                 pay_order       AS A
     LEFT JOIN   app_user_info   AS B ON A.consumer_id = B.user_id
     LEFT JOIN   sys_dept        AS C ON A.station_id = C.dept_id
+    LEFT JOIN   station_personnel   AS D ON A.oil_personnel_id = D.personnel_id
     WHERE
         A.order_no = #{orderNo}
   </select>

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

@@ -253,7 +253,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             class_start_date,
             class_structure_date,
             station_id,
-            station_name,
             count(order_no) as num,
             sum(order_liters) as order_liters,
             sum(amt) as amt,
@@ -272,7 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
             <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
         </where>
-        GROUP BY class_structure_no,class_start_date,station_id,station_name,class_structure_date,class_structure_man
+        GROUP BY class_structure_no,class_start_date,station_id,class_structure_date,class_structure_man
     </select>
 
     <!--按员工/支付方式汇总数据-->