设置订单的款项信息

src/main/java/com/caimei365/order/controller/ReceiptApi.java

@@ -305,7 +305,7 @@ public class ReceiptApi {
     }
 
     /**
-     * 确认收款-关联收款信息
+     * 确认收款-关联订单款
      * crm:/api/user/receivables/confirmReceipt
      *
      * @param receiptOperateDto {
@@ -315,7 +315,7 @@ public class ReceiptApi {
      *                            noOrderReason: 非订单款说明
      *                            }
      */
-    @ApiOperation("确认收款-关联收款信息")
+    @ApiOperation("确认收款-关联订单款")
     @PostMapping("/confirm")
     public ResponseJson<Void> receiptAssociate(ReceiptOperateDto receiptOperateDto, @RequestHeader HttpHeaders headers) {
         if (null == receiptOperateDto.getId() || receiptOperateDto.getId() <= 0) {

src/main/java/com/caimei365/order/service/ReceiptService.java

@@ -155,7 +155,7 @@ public interface ReceiptService {
 
 
     /**
-     * 关联收款信息
+     * 确认收款-关联订单款
      *
      * @param receiptOperateDto {
      *                          id: 收款Id

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -572,8 +572,6 @@ public class ReceiptServiceImpl implements ReceiptService {
                     // 订单信息
                     OrderVo order = orderCommonMapper.getOrderByOrderId(Integer.parseInt(receipt.getOrderFlag()));
                     if (null != order) {
-                        String userName = baseMapper.getUserNameByUserId(order.getUserId());
-                        order.setUserName(userName);
                         orderList.add(order);
                     }
                 }
@@ -598,6 +596,8 @@ public class ReceiptServiceImpl implements ReceiptService {
                         // 收款详情是否可以查看
                         order.setAuthority(true);
                     }
+                    // 设置订单的款项信息
+                    setOrderAmountInfo(order);
                 }
             }
             receipt.setOrderList(orderList);
@@ -975,7 +975,7 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     /**
-     * 关联收款信息
+     * 确认收款-关联订单款
      *
      * @param receiptOperateDto {
      *                            id: 收款Id