发货接口

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -188,7 +188,7 @@ public class UserServiceImpl implements UserService {
         userDao.insertByMapper(user);
         result.put("phone", phone);
         //判断登录用户是否是分销商
-        if (dto.getUserId() == 42192256L || dto.getUserId() == 60684039L || dto.getUserId() == 61074146L || dto.getUserId() == 3387401L) {
+        if (dto.getUserId() == 42192256L || dto.getUserId() == 61074146L || dto.getUserId() == 3387401L) {
             result.put("isShop", true);
             result.put("shopId", 61319910L);
         } else {

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -165,7 +165,23 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
 
     @Override
     public Result delivery(DistributionOrderRequestDto dto) {
-        return null;
+        try {
+            String distributionOrderId = dto.getDistributionOrderId();
+            DistributionOrder distributionOrder = distributionOrderDao.findById(distributionOrderId);
+            if (distributionOrder.getState() != DistributionEnum.DistributionOrderStateEnum.PRE_SEND.getCode()) {
+                return Result.failed("订单状态错误，不能发货");
+            }
+            DistributionOrder orderUpdateDto = new DistributionOrder();
+            orderUpdateDto.setDistributionOrderId(distributionOrderId);
+            orderUpdateDto.setLogisticsCode(dto.getLogisticsCode());
+            orderUpdateDto.setDeliveryTime(new Date());
+            orderUpdateDto.setState(DistributionEnum.DistributionOrderStateEnum.PRE_SIGNED.getCode());
+            distributionOrderDao.update(orderUpdateDto);
+            return Result.success();
+        } catch (Exception e) {
+            logger.info("发货失败 error: {}", e);
+        }
+        return Result.failed();
     }
 
     @Override

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/DistributionOrderController.java

@@ -88,6 +88,21 @@ public class DistributionOrderController {
         return distributionOrderService.cancel(dto);
     }
 
+    @ApiOperation(value = "发货")
+    @PostMapping("/delivery")
+    public Result delivery(@RequestBody DistributionOrderRequestDto dto) {
+        logger.info("发货,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("distributionOrderId", "分销订单号").must().string()
+                .set("logisticsCode", "快递公司编码").must().string()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(validator.getErrorInfo());
+        }
+        return distributionOrderService.delivery(dto);
+    }
+
+
 
     @ApiOperation(value = "用户确认收货")
     @PostMapping("/confirmSigned")