优化代码

java110-bean/src/main/java/com/java110/dto/storeOrderCart/StoreOrderCartDto.java

@@ -19,6 +19,13 @@ public class StoreOrderCartDto extends PageDto implements Serializable {
 
     public static final String STATE_WAIT_BUY = "1001";//未购买
     public static final String STATE_WAIT_SEND = "2002";//待发货
+    public static final String STATE_SENDING = "3003";//待收货
+    public static final String STATE_WAIT_REPAIR = "4004";//待评价
+    public static final String STATE_REQ_RETURN = "5005";//申请退款
+    public static final String STATE_RETURN_SUCCESS = "6006";//退货成功
+    public static final String STATE_RETURN_MONEY = "7007";//已退款
+    public static final String STATE_FINISH = "8008";//已评价
+
 
     private String valueId;
     private String productId;

service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java

@@ -291,6 +291,27 @@ public class StoreOrderApi {
         return updateStoreOrderCartBMOImpl.update(storeOrderCartPo);
     }
 
+    /**
+     * 发货接口
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /storeOrder/sendStoreOrderCart
+     * @path /app/storeOrder/sendStoreOrderCart
+     */
+    @RequestMapping(value = "/sendStoreOrderCart", method = RequestMethod.POST)
+    public ResponseEntity<String> sendStoreOrderCart(
+            @RequestHeader(value = "user-id",required = false) String userId,
+            @RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
+        Assert.hasKeyAndValue(reqJson, "cartId", "cartId不能为空");
+
+
+        StoreOrderCartPo storeOrderCartPo = BeanConvertUtil.covertBean(reqJson, StoreOrderCartPo.class);
+        return updateStoreOrderCartBMOImpl.sendOrderCart(storeOrderCartPo,userId);
+    }
+
     /**
      * 微信删除消息模板
      *

service-goods/src/main/java/com/java110/goods/bmo/storeOrderCart/IUpdateStoreOrderCartBMO.java

@@ -16,4 +16,11 @@ public interface IUpdateStoreOrderCartBMO {
     ResponseEntity<String> update(StoreOrderCartPo storeOrderCartPo);
 
 
+    /**
+     * 发货 接口
+     * @param storeOrderCartPo 购物车信息
+     * @param userId 操作员工
+     * @return
+     */
+    ResponseEntity<String> sendOrderCart(StoreOrderCartPo storeOrderCartPo, String userId);
 }

service-goods/src/main/java/com/java110/goods/bmo/storeOrderCart/impl/UpdateStoreOrderCartBMOImpl.java

@@ -1,9 +1,13 @@
 package com.java110.goods.bmo.storeOrderCart.impl;
 
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.storeOrderCart.StoreOrderCartDto;
 import com.java110.goods.bmo.storeOrderCart.IUpdateStoreOrderCartBMO;
+import com.java110.intf.goods.IStoreOrderCartEventInnerServiceSMO;
 import com.java110.intf.goods.IStoreOrderCartInnerServiceSMO;
 import com.java110.po.storeOrderCart.StoreOrderCartPo;
+import com.java110.po.storeOrderCartEvent.StoreOrderCartEventPo;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -15,6 +19,9 @@ public class UpdateStoreOrderCartBMOImpl implements IUpdateStoreOrderCartBMO {
     @Autowired
     private IStoreOrderCartInnerServiceSMO storeOrderCartInnerServiceSMOImpl;
 
+    @Autowired
+    private IStoreOrderCartEventInnerServiceSMO storeOrderCartEventInnerServiceSMOImpl;
+
     /**
      * @param storeOrderCartPo
      * @return 订单服务能够接受的报文
@@ -31,4 +38,35 @@ public class UpdateStoreOrderCartBMOImpl implements IUpdateStoreOrderCartBMO {
         return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
     }
 
+    /**
+     * 发货接口
+     *
+     * @param storeOrderCartPo 购物车信息
+     * @param userId           操作员工
+     * @return
+     */
+    @Override
+    @Java110Transactional
+    public ResponseEntity<String> sendOrderCart(StoreOrderCartPo storeOrderCartPo, String userId) {
+        storeOrderCartPo.setState(StoreOrderCartDto.STATE_SENDING);
+        int flag = storeOrderCartInnerServiceSMOImpl.updateStoreOrderCart(storeOrderCartPo);
+        if (flag < 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+        }
+
+        StoreOrderCartEventPo storeOrderCartEventPo = new StoreOrderCartEventPo();
+        storeOrderCartEventPo.setCartId(storeOrderCartPo.getCartId());
+        storeOrderCartEventPo.setOrderId(storeOrderCartPo.getOrderId());
+        storeOrderCartEventPo.setEventId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_eventId));
+        storeOrderCartEventPo.setEventObjType("S");
+        storeOrderCartEventPo.setEventObjId(userId);
+        storeOrderCartEventPo.setEventMsg("商家发货");
+        flag = storeOrderCartEventInnerServiceSMOImpl.saveStoreOrderCartEvent(storeOrderCartEventPo);
+
+        if (flag < 1) {
+            throw new IllegalArgumentException("保存购物车事件失败");
+        }
+        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+    }
+
 }