Prechádzať zdrojové kódy

采美豆抵扣优惠券

zhijiezhao 3 rokov pred
rodič
commit
c3a9929a58

+ 4 - 3
src/main/java/com/caimei365/order/service/impl/HeliPayNonOrderServiceImpl.java

@@ -1922,9 +1922,10 @@ public class HeliPayNonOrderServiceImpl implements HeliPayNonOrderService {
         if (null == co) {
             return ResponseJson.error("暂不可兑换该优惠券!", null);
         }
-        Integer needBeans = Integer.valueOf(co.getMoneyCouponPrice().toString());
+        double moneyCouponPrice = co.getMoneyCouponPrice();
+        int needBeans = (int) moneyCouponPrice;
         if (beans < needBeans) {
-            return ResponseJson.error("采美豆余额不足!", null);
+            return ResponseJson.error("采美豆数量不足!", null);
         }
         //给券
         CouponClubPo couponClubPo = new CouponClubPo();
@@ -1944,7 +1945,7 @@ public class HeliPayNonOrderServiceImpl implements HeliPayNonOrderService {
         userBeansHistory.setPushStatus(0);
         userBeansHistory.setDelFlag(0);
         productService.updateUserBeans(userBeansHistory, beans - needBeans, null);
-        return ResponseJson.success("购买成功!", null);
+        return ResponseJson.success("抵扣成功!", null);
     }
 
     public void saveRoleRelation(Integer userId, String roleIds) {

+ 2 - 1
src/main/resources/mapper/OrderCommonMapper.xml

@@ -536,7 +536,8 @@
                cc.userId,
                cc.shopId,
                cc.productType,
-               cc.categoryType
+               cc.categoryType,
+               cc.couponPayWay
         FROM cm_coupon_club a
                  LEFT JOIN cm_coupon cc ON a.couponId = cc.id
         WHERE cc.delFlag = 0