Merge branch 'master' of http://gogs.chelvc.com/wuyongqiang/vehicle

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/OmsGoodsModifyParam.java

@@ -0,0 +1,55 @@
+package com.chelvc.cloud.vehicle.client.param;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 购物车对象 oms_cart_item
+ * 
+ * @author liude
+ * @date 2023-11-08
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString(callSuper = true)
+public class OmsGoodsModifyParam implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+    /**
+     * 商品id
+     */
+    private Long goodsId;
+
+    /** 购买数量 */
+    private Integer quantity;
+
+    /** 购买商品的价格 */
+    private BigDecimal price;
+
+    /** 商品主图 */
+    private String goodsPic;
+
+    /** 商品名称 */
+    @NotEmpty(message = "商品名称不能为空")
+    private String goodsName;
+
+    /** 商品副标题（卖点） */
+    private String goodsSubTitle;
+
+    /** 商品分类 */
+    private Long goodsCategoryId;
+    /**
+     * 商品原价
+     */
+    private Double originalPrice;
+
+}

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/OmsOrderModifyParam.java

@@ -45,4 +45,8 @@ public class OmsOrderModifyParam implements Serializable
      * 商家id
      */
     private Long merchantId;
+    /**
+     * 商品信息
+     */
+    private OmsGoodsModifyParam goodsInfo;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -103,28 +103,44 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         List<OmsOrderItem> orderItemList = new ArrayList<>();
         //获取购物车及优惠信息
         Long userId = SessionContextHolder.getId();
-        List<OmsCartItemDTO> cartPromotionItemList = omsCartItemService.listPromotion(orderParam.getCartIds());
-        for (OmsCartItemDTO cartPromotionItem : cartPromotionItemList) {
+        List<OmsCartItemDTO> cartPromotionItemList = new ArrayList<>();
+        if (CollectionUtils.isEmpty(orderParam.getCartIds())){
             //生成下单商品信息
             OmsOrderItem orderItem = new OmsOrderItem();
-            orderItem.setGoodsId(cartPromotionItem.getGoodsId());
-            orderItem.setGoodsName(cartPromotionItem.getGoodsName());
-            orderItem.setGoodsPic(cartPromotionItem.getGoodsPic());
-            orderItem.setGoodsAttr(cartPromotionItem.getGoodsAttr());
-            orderItem.setGoodsBrand(cartPromotionItem.getGoodsBrand());
-            orderItem.setGoodsSn(cartPromotionItem.getGoodsSn());
-            orderItem.setGoodsPrice(cartPromotionItem.getPrice());
-            orderItem.setGoodsQuantity(cartPromotionItem.getQuantity());
-            orderItem.setGoodsSkuId(cartPromotionItem.getGoodsSkuId());
-            orderItem.setGoodsSkuCode(cartPromotionItem.getGoodsSkuCode());
-            orderItem.setGoodsCategoryId(cartPromotionItem.getGoodsCategoryId());
+            orderItem.setGoodsId(orderParam.getGoodsInfo().getGoodsId());
+            orderItem.setGoodsName(orderParam.getGoodsInfo().getGoodsName());
+            orderItem.setGoodsPic(orderParam.getGoodsInfo().getGoodsPic());
+            orderItem.setGoodsPrice(orderParam.getGoodsInfo().getPrice());
+            orderItem.setGoodsQuantity(orderParam.getGoodsInfo().getQuantity());
+            orderItem.setGoodsCategoryId(orderParam.getGoodsInfo().getGoodsCategoryId());
 //            orderItem.setPromotionAmount(cartPromotionItem.getReduceAmount());
 //            orderItem.setPromotionName(cartPromotionItem.getPromotionMessage());
             orderItem.setGiftIntegration(0L);
             orderItem.setGiftGrowth(0);
             orderItemList.add(orderItem);
+        }else{
+            cartPromotionItemList = omsCartItemService.listPromotion(orderParam.getCartIds());
+            for (OmsCartItemDTO cartPromotionItem : cartPromotionItemList) {
+                //生成下单商品信息
+                OmsOrderItem orderItem = new OmsOrderItem();
+                orderItem.setGoodsId(cartPromotionItem.getGoodsId());
+                orderItem.setGoodsName(cartPromotionItem.getGoodsName());
+                orderItem.setGoodsPic(cartPromotionItem.getGoodsPic());
+                orderItem.setGoodsAttr(cartPromotionItem.getGoodsAttr());
+                orderItem.setGoodsBrand(cartPromotionItem.getGoodsBrand());
+                orderItem.setGoodsSn(cartPromotionItem.getGoodsSn());
+                orderItem.setGoodsPrice(cartPromotionItem.getPrice());
+                orderItem.setGoodsQuantity(cartPromotionItem.getQuantity());
+                orderItem.setGoodsSkuId(cartPromotionItem.getGoodsSkuId());
+                orderItem.setGoodsSkuCode(cartPromotionItem.getGoodsSkuCode());
+                orderItem.setGoodsCategoryId(cartPromotionItem.getGoodsCategoryId());
+//            orderItem.setPromotionAmount(cartPromotionItem.getReduceAmount());
+//            orderItem.setPromotionName(cartPromotionItem.getPromotionMessage());
+                orderItem.setGiftIntegration(0L);
+                orderItem.setGiftGrowth(0);
+                orderItemList.add(orderItem);
+            }
         }
-
         //判断购物车中商品是否都有库存
 //        if (!hasStock(cartPromotionItemList)) {
 //            Asserts.fail("库存不足，无法下单");
@@ -137,13 +153,13 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
             }
         } else {
             //使用优惠券
-            UserCouponDTO userCouponDTO = getUseCoupon(cartPromotionItemList, orderParam.getCouponId());
-            if (userCouponDTO == null) {
-                Asserts.check(true, "该优惠券不可用");
-            }
-            //对下单商品的优惠券进行处理
-            assert userCouponDTO != null;
-            handleCouponAmount(orderItemList, userCouponDTO);
+//            UserCouponDTO userCouponDTO = getUseCoupon(cartPromotionItemList, orderParam.getCouponId());
+//            if (userCouponDTO == null) {
+//                Asserts.check(true, "该优惠券不可用");
+//            }
+//            //对下单商品的优惠券进行处理
+//            assert userCouponDTO != null;
+//            handleCouponAmount(orderItemList, userCouponDTO);
         }
         //判断是否使用积分
         if (orderParam.getUseIntegration() == null || orderParam.getUseIntegration().equals(0)) {