xiuagi

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

@@ -32,6 +32,7 @@ public class LabelController {
 
     @Resource
     private LabelService labelService;
+
     //用户扫码进标签
     @RequestMapping(value = "/addUserToLabel", method = RequestMethod.GET)
     @ResponseBody

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

@@ -313,8 +313,8 @@ public class PayOrderController {
         BigDecimal sellAmt = new BigDecimal(0);         //油站结算价支付金额
         BigDecimal discountPrice = oilPrice;                //司机销售价
         BigDecimal sellPrice = discountPrice;              //油站销售价
-        BigDecimal sellSumAmt = amt;
-        BigDecimal sellSumDiscount = new BigDecimal("0");
+        BigDecimal sellSumAmt = amt;                            //销售价支付金额
+        BigDecimal sellSumDiscount = new BigDecimal("0");   //销售价优惠金额
         //加油升数
         oilLiters = receivableAmt.divide(oilPrice,2, BigDecimal.ROUND_HALF_UP);
 //        if(!oilLiters.toString().substring(oilLiters.toString().indexOf(".") + 1).equals("00")){