|
@@ -12,6 +12,7 @@ import com.caimei.modules.coupon.dao.CmCouponDao;
|
|
import com.caimei.modules.coupon.entity.CmCoupon;
|
|
import com.caimei.modules.coupon.entity.CmCoupon;
|
|
import com.caimei.modules.coupon.entity.CmCouponClub;
|
|
import com.caimei.modules.coupon.entity.CmCouponClub;
|
|
import com.caimei.modules.coupon.entity.CmCouponOrderRecord;
|
|
import com.caimei.modules.coupon.entity.CmCouponOrderRecord;
|
|
|
|
+import com.caimei.modules.coupon.entity.CmCouponRedemptionCode;
|
|
import com.caimei.modules.coupon.service.CmCouponService;
|
|
import com.caimei.modules.coupon.service.CmCouponService;
|
|
import com.caimei.modules.miniprogram.utils.UploadPicUtils;
|
|
import com.caimei.modules.miniprogram.utils.UploadPicUtils;
|
|
import com.caimei.modules.order.dao.*;
|
|
import com.caimei.modules.order.dao.*;
|
|
@@ -34,6 +35,8 @@ import com.caimei.modules.user.service.CmUserBalanceRecordService;
|
|
import com.caimei.modules.user.service.CmUserService;
|
|
import com.caimei.modules.user.service.CmUserService;
|
|
import com.caimei.modules.user.utils.ReturnedPurchaseStatus;
|
|
import com.caimei.modules.user.utils.ReturnedPurchaseStatus;
|
|
import com.caimei.modules.user.utils.UserUtils;
|
|
import com.caimei.modules.user.utils.UserUtils;
|
|
|
|
+import com.caimei.po.CouponClub;
|
|
|
|
+import com.caimei.po.CouponRedemptionCode;
|
|
import com.caimei.po.ProductLadderPrice;
|
|
import com.caimei.po.ProductLadderPrice;
|
|
import com.caimei.po.neworder.CmShopOrder;
|
|
import com.caimei.po.neworder.CmShopOrder;
|
|
import com.caimei.utils.*;
|
|
import com.caimei.utils.*;
|
|
@@ -1225,6 +1228,30 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
|
|
order.setConfirmTime(curDateStr);
|
|
order.setConfirmTime(curDateStr);
|
|
if (order.getBalancePayFee() != null && order.getBalancePayFee() > 0) {
|
|
if (order.getBalancePayFee() != null && order.getBalancePayFee() > 0) {
|
|
saveDiscernReceipt(order.getBalancePayFee(), orderID);
|
|
saveDiscernReceipt(order.getBalancePayFee(), orderID);
|
|
|
|
+ //针对商品productId:6898,做兑换券操作(couponId:15)
|
|
|
|
+ if ("3".equals(order.getReceiptStatus())) {
|
|
|
|
+ List<NewOrderProduct> orderProducts = newOrderProductDao.findListByOrderID(orderID);
|
|
|
|
+ for (NewOrderProduct orderProduct : orderProducts) {
|
|
|
|
+ if (orderProduct.getProductID().equals(6898)) {
|
|
|
|
+ Integer num = orderProduct.getNum();
|
|
|
|
+ for (int i = 0; i < num; i++) {
|
|
|
|
+ CmCouponRedemptionCode redemptionCode = cmCouponClubDao.findRedemptionCode(15);
|
|
|
|
+ if (redemptionCode != null) {
|
|
|
|
+ CmCouponClub couponClub = new CmCouponClub();
|
|
|
|
+ couponClub.setCouponId(redemptionCode.getCouponId());
|
|
|
|
+ couponClub.setUserId(order.getUserID());
|
|
|
|
+ couponClub.setSource("5");
|
|
|
|
+ couponClub.setStatus("1");
|
|
|
|
+ couponClub.setCreateDate(new Date());
|
|
|
|
+ couponClub.setDelFlag("0");
|
|
|
|
+ cmCouponClubDao.insert(couponClub);
|
|
|
|
+ cmCouponClubDao.updateRedemptionCode(redemptionCode.getId(), couponClub.getId());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
newOrderDao.update(order);
|
|
newOrderDao.update(order);
|
|
}
|
|
}
|