取消订单修改

src/main/java/com/caimei/modules/order/entity/NewOrderProduct.java

@@ -112,6 +112,7 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     private CmPromotion productPromotion; //下单时商品对应的促销活动
     private Integer ladderPriceFlag;        // 启用阶梯价格标识 0否 1是
     private Integer couponsLogo;        //显示优惠券查看: 1不显示 2显示
+    private String commodityType;//商品属性：1产品，2仪器
 
     public Integer getLadderPriceFlag() {
         return ladderPriceFlag;
@@ -953,4 +954,12 @@ public class NewOrderProduct extends DataEntity<NewOrderProduct> {
     public void setCouponsLogo(Integer couponsLogo) {
         this.couponsLogo = couponsLogo;
     }
+
+    public String getCommodityType() {
+        return commodityType;
+    }
+
+    public void setCommodityType(String commodityType) {
+        this.commodityType = commodityType;
+    }
 }

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -7,8 +7,10 @@ import com.caimei.exception.BusinessException;
 import com.caimei.modules.bulkpurchase.dao.OrderInvoiceDao;
 import com.caimei.modules.bulkpurchase.entity.OrderInvoice;
 import com.caimei.modules.bulkpurchase.service.OrderInvoiceService;
+import com.caimei.modules.coupon.dao.CmCouponClubDao;
 import com.caimei.modules.coupon.dao.CmCouponDao;
 import com.caimei.modules.coupon.entity.CmCoupon;
+import com.caimei.modules.coupon.entity.CmCouponClub;
 import com.caimei.modules.coupon.entity.CmCouponOrderRecord;
 import com.caimei.modules.coupon.service.CmCouponService;
 import com.caimei.modules.miniprogram.utils.UploadPicUtils;
@@ -113,6 +115,8 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     private CmCouponDao cmCouponDao;
     @Autowired
     private CmCouponService cmCouponService;
+    @Autowired
+    private CmCouponClubDao cmCouponClubDao;
 
     @Transactional(readOnly = false)
     public void updateClauseContent(NewOrder newOrder) {
@@ -1326,6 +1330,21 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 }
             }
         }
+        //优惠券退回
+        if (order.getCouponAmount() > 0 && !"0".equals(order.getStatus())) {
+            CmCouponOrderRecord couponRecord = newOrderDao.findOrderCouponRecord(order.getOrderID());
+            if (couponRecord != null) {
+                CmCouponClub couponClub = cmCouponClubDao.get(couponRecord.getClubCouponId().toString());
+                couponClub.setOrderId(null);
+                couponClub.setReturnedId(0);
+                couponClub.setSource("3");
+                couponClub.setStatus("1");
+                couponClub.setCreateDate(new Date());
+                couponClub.setUseDate(null);
+                couponClub.setDelFlag("0");
+                cmCouponClubDao.insert(couponClub);
+            }
+        }
     }
 
     /**

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -242,6 +242,7 @@ public class NewOrderController extends BaseController {
                         }
                     }
                     Product product = productDao.get(orderProduct.getProductID().toString());
+                    orderProduct.setCommodityType(product.getCommodityType());
                     if (null == orderPromotions) {
                         if (1 == orderProduct.getLadderPriceFlag() && "1".equals(product.getLadderPriceFlag())) {
                             // 查询商品当前阶梯价格

src/main/webapp/WEB-INF/views/modules/order/orderForm.jsp

@@ -331,7 +331,7 @@
         <div style="margin-top:20px;font-size:15px;border-bottom:2px solid #050202"><b>优惠券</b><a id="redeemCoupons" href="javascript:;" class="btn btn-primary" style="padding:1px 10px;margin:2px 30px;">兑换优惠券</a></div>
         <!-- $('input[name=clubCouponId]:checked').val() -->
         <ul class="couponContent">
-            <li><label><input type="radio" name="clubCouponId" value="0"><span class="couponDesc none">不使用优惠券</span></label></li>
+            <li><label><input type="radio" checked name="clubCouponId" value="0"><span class="couponDesc none">不使用优惠券</span></label></li>
         </ul>
         <from:hidden path="clubCouponId" />
     </div>
@@ -363,8 +363,8 @@
             </span>元
             <from:hidden path="promotionFullReduction" />
         </td>
-        <td style="text-align:right;">优惠券抵扣：</td>
-        <td><span class="couponPrice"><fmt:formatNumber value="${empty order.couponAmount?'0.00':(order.couponAmount)}" pattern="#0.00"/></span>元 
+        <td style="text-align:right;">优惠券抵扣${order.couponAmount}：</td>
+        <td><span class="couponPrice"><fmt:formatNumber value="${empty order.couponAmount?'0.00':(order.couponAmount)}" pattern="#0.00"/></span>元
             <from:hidden path="couponAmount"/></td>
         <td>商品总数</td>
         <td><span class="productCount">${empty order.productCount?'0':(order.productCount)}</span>

src/main/webapp/static/modules/bulkpurchase/orderForm.js

@@ -475,16 +475,14 @@ function setPageCoupon() {
     });
     $("#couponBox").find(".couponContent").html(html);
     if (clubCouponId > 0) {
-        $("#couponBox").find("input[name=clubCouponId]").trigger("change");
+        $("#couponBox").find("input[name=clubCouponId][checked=checked]").trigger("change");
     }
 }
 
 // 勾选优惠券重新计算总价
 $("#couponBox").on("change", "input[name=clubCouponId]", function(){
-    //alert($('input[name=clubCouponId]:checked').val())
-    console.log($(this).val())
     couponPrice = 0;
-    var clubCouponId = $(this).val()*1
+    var clubCouponId = $(this).val()*1;
     selectCoupons.forEach(function(item){
         if(item.clubCouponId*1 === clubCouponId) {
             couponPrice = item.couponAmount;