xiugai

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

@@ -395,7 +395,9 @@ public class CouponController {
                                                 if(couponService.addUserCoupon(userCouponParam) == 1) {
                                                     //更新该优惠券的领取数量
                                                     Coupon coupon_up = new Coupon();
+
                                                     coupon_up.setCouponId(couponId);
+                                                    logger.info("当前领取优惠券的模板ID：" + couponId);
                                                     couponCumulativeNum = couponCumulativeNum + 1;
                                                     coupon_up.setCouponCumulativeNum(couponCumulativeNum);
                                                     couponService.updateCouponInfo(coupon_up);
@@ -604,6 +606,16 @@ public class CouponController {
                                             userCoupon.setCouponIsUsed("1");
                                             couponService.updateCouponUserInfo(userCoupon);
                                             resultData = ResultData.success("核销成功！");
+
+                                            UserCoupon u = new UserCoupon();
+                                            u.setId(userCouponInfo.getId());
+                                            UserCoupon ucResult = couponService.selectUserCouponInfo(u);
+                                            Coupon coupon_up = new Coupon();
+                                            coupon_up.setCouponId(userCouponInfo.getCouponId());
+                                            Integer couponUseNum = ucResult.getCouponUseNum();
+                                            couponUseNum = couponUseNum + 1;
+                                            coupon_up.setCouponNum(couponUseNum);
+                                            couponService.updateCouponInfo(coupon_up);
                                         }else {
                                             resultData = ResultData.error(CodeMsg.ERROR_VERIFICATION);
                                         }
@@ -612,6 +624,19 @@ public class CouponController {
                                         userCoupon.setCouponIsUsed("1");
                                         couponService.updateCouponUserInfo(userCoupon);
                                         resultData = ResultData.success("核销成功！");
+
+                                        UserCoupon u = new UserCoupon();
+                                        u.setId(userCouponInfo.getId());
+                                        UserCoupon ucResult = couponService.selectUserCouponInfo(u);
+                                        Coupon coupon_up = new Coupon();
+                                        coupon_up.setCouponId(ucResult.getCouponId());
+                                        Integer couponUseNum = ucResult.getCouponUseNum();
+                                        logger.info("当前优惠券模板已使用次数："+ couponUseNum.toString());
+                                        couponUseNum = couponUseNum + 1;
+                                        logger.info("当前优惠券模板本次使用后次数："+ couponUseNum.toString());
+                                        coupon_up.setCouponUseNum(couponUseNum);
+                                        couponService.updateCouponInfo(coupon_up);
+
                                     }else {
                                         //当前异业券不能在此异业端核销
                                         resultData = ResultData.error(CodeMsg.ERROR_VERIFICATION);

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

@@ -489,9 +489,10 @@ public class ElectronicMembershipCardController {
                         Coupon coupon_up = new Coupon();
                         coupon_up.setCouponId(userCouponInfo.getCouponId());
                         Integer couponUseNum = userCouponInfo.getCouponUseNum();
+                        logger.info("当前优惠券模板已使用次数："+ couponUseNum.toString());
                         couponUseNum = couponUseNum + 1;
-                        //coupon_up.setCouponCumulativeNum(couponUseNum);
-                        coupon_up.setCouponNum(couponUseNum);
+                        logger.info("当前优惠券模板本次使用后次数："+ couponUseNum.toString());
+                        coupon_up.setCouponUseNum(couponUseNum);
                         couponService.updateCouponInfo(coupon_up);
 
                     }

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

@@ -1002,9 +1002,10 @@ public class PayController {
                                         Coupon coupon_up = new Coupon();
                                         coupon_up.setCouponId(userCouponInfo.getCouponId());
                                         Integer couponUseNum = userCouponInfo.getCouponUseNum();
+                                        logger.info("当前优惠券模板已使用次数："+ couponUseNum.toString());
                                         couponUseNum = couponUseNum + 1;
-                                        //coupon_up.setCouponCumulativeNum(couponUseNum);
-                                        coupon_up.setCouponNum(couponUseNum);
+                                        logger.info("当前优惠券模板本次使用后次数："+ couponUseNum.toString());
+                                        coupon_up.setCouponUseNum(couponUseNum);
                                         couponService.updateCouponInfo(coupon_up);
 
                                         //主动领取优惠券
@@ -1364,10 +1365,9 @@ public class PayController {
                     UserCoupon u = new UserCoupon();
                     u.setUnionId(unionId);
                     u.setStationId(stationId);
+                    int userCouponCountUsed = couponService.selectUserCouponCount(u);
                     u.setCouponIsUsed("0");
                     int userCouponCount = couponService.selectUserCouponCount(u);
-                    u.setCouponIsUsed("1");
-                    int userCouponCountUsed = couponService.selectUserCouponCount(u);
                     if(couponNum >0){
                         if(userCouponCount < couponHoldNum){
                             if(userCouponCountUsed < couponReceiveNum){

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

@@ -413,6 +413,7 @@ public class PosMachineController {
         Integer stationId=stationClassStructure.getStationId();
         //String stationName=stationClassStructure.getStationName();
         String username = stationClassStructure.getClassStructureMan();
+        logger.info("POS班结参数信息：油站ID："+ stationId.toString() + "班结人："+ username);
         //根据油站查询出油站是否班结过，班结过就需要查询上次班结的时间
         StationClassStructure classes =new StationClassStructure();
         classes.setStationId(stationId);