门店供应链物品管理/记录

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelGoodsSettleMgrController.java

@@ -21,6 +21,7 @@ import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.ChannelGoodsOrderSettleEnum;
 import com.qs.mp.common.enums.ChannelGoodsOrderStatusEnum;
+import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.system.service.id.BizIdGenerator;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
@@ -134,7 +135,7 @@ public class ChannelGoodsSettleMgrController extends BaseApiController {
     @ApiOperation(value = "推送结算订单")
     public AjaxResult settleOrder(@RequestBody PushChannelGoodsSettleParam settleVO) {
         if (settleVO.getSettleAmt() <= 0) {
-
+            throw new ServiceException("结算金额必须大于0");
         }
         String settleOrderId = settleOrderService.pushSettleOrder(settleVO);
         return AjaxResult.success(settleOrderId);

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelGoodsOrderController.java

@@ -341,7 +341,7 @@ public class ChannelGoodsOrderController extends BaseApiController {
             return AjaxResult.error("非法操作他人订单");
         }
         channelGoodsOrderService.confirmOrder(channelGoodsOrder);
-        return AjaxResult.success("确认收藏成功");
+        return AjaxResult.success("确认收货成功");
 
     }
 }

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelSettleVO.java

@@ -36,6 +36,9 @@ public class ChannelSettleVO {
     @ApiModelProperty("创建时间")
     private Date createdTime;
 
+    @ApiModelProperty("结算时间")
+    private Date payTime;
+
     @ApiModelProperty("结算订单明细")
     private List<ChannelGoodsSettleOrderItem> items;