Browse Source

确认订单修改

plf 3 years ago
parent
commit
98129aa9e2

+ 8 - 0
src/main/java/com/caimei/modules/coupon/dao/CmCouponClubDao.java

@@ -52,4 +52,12 @@ public interface CmCouponClubDao extends CrudDao<CmCouponClub> {
      * @param returnedId
      * @param returnedId
      */
      */
     void deleteByReturnedId(int returnedId);
     void deleteByReturnedId(int returnedId);
+
+    /**
+     * 查询一张未使用兑换码券
+     *
+     * @param couponId
+     * @return
+     */
+    CmCouponRedemptionCode findRedemptionCode(int couponId);
 }
 }

+ 27 - 0
src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -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);
     }
     }

+ 20 - 0
src/main/resources/mappings/modules/coupon/CmCouponClubMapper.xml

@@ -242,5 +242,25 @@
 	<update id="deleteByReturnedId">
 	<update id="deleteByReturnedId">
 		UPDATE cm_coupon_club SET delFlag = 1 WHERE returnedId = #{returnedId} AND status = 1 AND source = 3
 		UPDATE cm_coupon_club SET delFlag = 1 WHERE returnedId = #{returnedId} AND status = 1 AND source = 3
 	</update>
 	</update>
+
+	<select id="findRedemptionCode" resultType="com.caimei.modules.coupon.entity.CmCouponRedemptionCode">
+        SELECT
+          `id`,
+          `couponId`,
+          `clubCouponId`,
+          `redemptionCode`,
+          `status`,
+          `redemptionTime`,
+          `addTime`
+        FROM
+          cm_coupon_redemption_code
+        WHERE
+          couponId = #{couponId}
+          AND STATUS = 1
+        ORDER BY
+          id
+        LIMIT
+          1
+    </select>
 	
 	
 </mapper>
 </mapper>

+ 7 - 2
src/main/webapp/static/modules/bulkpurchase/orderForm.js

@@ -219,6 +219,7 @@ $(function() {
         productList.forEach(function(data) {
         productList.forEach(function(data) {
             setProductList(data);
             setProductList(data);
         });
         });
+        setOrderFee(); //设置底部订单金额
         initFlag = true;
         initFlag = true;
     }
     }
 });
 });
@@ -394,6 +395,7 @@ function editShop(obj) {
                         console.log(items[0]);
                         console.log(items[0]);
                         setProductList(items[0], false); //设置商品列表
                         setProductList(items[0], false); //设置商品列表
                         //                            initStages();//初始化分期信息
                         //                            initStages();//初始化分期信息
+                        setOrderFee(); //设置底部订单金额
                     }
                     }
                     return true;
                     return true;
                 }
                 }
@@ -519,6 +521,7 @@ function orderSecondHandEditShop(obj) {
                     } else {
                     } else {
                         console.log(items[0]);
                         console.log(items[0]);
                         setProductList(items[0], false); //设置商品列表
                         setProductList(items[0], false); //设置商品列表
+                        setOrderFee(); //设置底部订单金额
                     }
                     }
                     return true;
                     return true;
                 }
                 }
@@ -629,6 +632,7 @@ function resetProductList(setData) {
             setProductList(setData, false);
             setProductList(setData, false);
         }
         }
     }
     }
+    setOrderFee(); //设置底部订单金额
 }
 }
 
 
 function deleteShopProduct(obj) {
 function deleteShopProduct(obj) {
@@ -935,7 +939,7 @@ function appendProductList(str, data, cmPromotion) {
         }
         }
     }
     }
     setShopOrderFee(data.shopId);
     setShopOrderFee(data.shopId);
-    setOrderFee(); //设置底部订单金额
+    // setOrderFee(); //设置底部订单金额
     product_index++;
     product_index++;
     // 设置赠品
     // 设置赠品
     setGiftHtmlList(data, cmPromotion);
     setGiftHtmlList(data, cmPromotion);
@@ -1092,7 +1096,7 @@ function setGiftHtmlList(data, cmPromotion) {
         }
         }
     }
     }
     // 重新设置底部订单金额
     // 重新设置底部订单金额
-    setOrderFee();
+    // setOrderFee();
     // 重新设置返佣订单选项
     // 重新设置返佣订单选项
     showRebateCheck();
     showRebateCheck();
 }
 }
@@ -1915,6 +1919,7 @@ function cmFee(i) {
 
 
 //经理折扣后计算
 //经理折扣后计算
 function setProductTotalFee() {
 function setProductTotalFee() {
+    debugger
     var discount = Number($("#discount").val()); //经理折扣金额
     var discount = Number($("#discount").val()); //经理折扣金额
     if (isNaN(discount)) {
     if (isNaN(discount)) {
         discount = Number($("#discountFee").val());
         discount = Number($("#discountFee").val());