优化

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

@@ -109,6 +109,9 @@ public class UserDeliverOrderController extends BaseApiController {
    */
   @PostMapping("/order/list")
   @ApiOperation(value = "订单列表" , notes = "获取所有订单信息")
+  @ApiResponses(
+          @ApiResponse(code = 200, message = "success", response = DeliverOrderVO.class)
+  )
   public TableDataInfo list(@RequestBody JSONObject param) {
     Long userId = SecurityUtils.getLoginUser().getUserId();
     String status = param.getString("status");

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserDeliverOrderItemVO.java

@@ -20,6 +20,9 @@ public class UserDeliverOrderItemVO  extends UserDeliverOrderItem {
 	@ApiModelProperty("sku编号")
 	private String skuCode;
 
+	@ApiModelProperty("商品金额")
+	private Integer price;
+
 	@ApiModelProperty("供应商名称")
 	private String supplierName;
 

mp-service/src/main/java/com/qs/mp/user/service/IUserDeliverOrderService.java

@@ -38,11 +38,19 @@ public interface IUserDeliverOrderService extends IService<UserDeliverOrder> {
 	/**
 	 * 取消订单
 	 *
-	 * @param orderId
+	 * @param param
 	 * @return
 	 */
 	boolean cancelOrder(UserDeliverOrderCancelParam param);
 
+	/**
+	 * 取消订单
+	 *
+	 * @param orderId
+	 * @return
+	 */
+	boolean cancelOrder(String orderId);
+
 	/**
 	 * 支付成功回调
 	 *

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -119,7 +119,15 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
     return userDeliverOrder.getOrderId();
   }
 
-  @Override
+    @Override
+    public boolean cancelOrder(String orderId) {
+        UserDeliverOrderCancelParam userDeliverOrderCancelParam = new UserDeliverOrderCancelParam();
+        userDeliverOrderCancelParam.setOrderId(orderId);
+        userDeliverOrderCancelParam.setResource(DeliverOrderResourceEnum.DELIVER);
+        return this.cancelOrder(userDeliverOrderCancelParam);
+    }
+
+    @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean cancelOrder(UserDeliverOrderCancelParam param) {
       String orderId = param.getOrderId();

mp-service/src/main/resources/mapper/admin/PrizeRecoveryMapper.xml

@@ -30,14 +30,14 @@
                 t2.nick_name,
                 t2.phonenumber userPhone
         from mp_prize_recovery t1
-        left join sys_user t2 on t1.user_id = t2.user_id;
+        left join sys_user t2 on t1.user_id = t2.user_id
         ${ew.customSqlSegment}
     </select>
 
     <select id="countByWrapper" resultType="int">
         select count(*)
         from mp_prize_recovery t1
-        left join sys_user t2 on t1.user_id = t2.user_id;
+        left join sys_user t2 on t1.user_id = t2.user_id
         ${ew.customSqlSegment}
     </select>
 </mapper>