订单列表已收金额

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

@@ -495,9 +495,9 @@ public class ReceiptServiceImpl implements ReceiptService {
         // 收款款项类型receiptType：2非订单款
         if (null != receiptOperateDto.getReceiptType() && 2 == receiptOperateDto.getReceiptType()) {
             receiptPo.setNoOrderReason(receiptOperateDto.getNoOrderReason());
-            if(receiptOperateDto.getNewReceiptType()==2){
-               receiptPo.setShopOrderId(receiptOperateDto.getShopOrderId());
-            }else {
+            if (receiptOperateDto.getNewReceiptType() == 2) {
+                receiptPo.setShopOrderId(receiptOperateDto.getShopOrderId());
+            } else {
                 receiptPo.setShopId(receiptOperateDto.getShopId());
                 receiptPo.setShopName(receiptOperateDto.getShopName());
             }
@@ -530,7 +530,7 @@ public class ReceiptServiceImpl implements ReceiptService {
      * @param pageSize      每页数量
      */
     @Override
-    public ResponseJson<PageInfo<ReceiptVo>> getReceiptList(Integer newReceiptType,Integer receiptType, Integer receiptStatus, String smsContent, String startDate, String endDate, int pageNum, int pageSize, HttpHeaders headers) {
+    public ResponseJson<PageInfo<ReceiptVo>> getReceiptList(Integer newReceiptType, Integer receiptType, Integer receiptStatus, String smsContent, String startDate, String endDate, int pageNum, int pageSize, HttpHeaders headers) {
         ReceiptParamsBo paramsBo = new ReceiptParamsBo();
         PageInfo<ReceiptVo> emptyInfo = new PageInfo();
         if (null != receiptStatus && receiptStatus > 0) {
@@ -650,7 +650,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         ReceiptVo receipt = receiptMapper.getReceiptDetail(id);
         //超级管理员可以看，其他人不能看已确认的单
         if (null != receipt.getConfirmUserPermissionId()) {
-            if(1 == receiptUser.getUserType() && !receiptUser.getId().equals(receipt.getConfirmUserPermissionId())){
+            if (1 == receiptUser.getUserType() && !receiptUser.getId().equals(receipt.getConfirmUserPermissionId())) {
                 return ResponseJson.error("无权限操作！", null);
             }
         }
@@ -671,27 +671,27 @@ public class ReceiptServiceImpl implements ReceiptService {
                 // 已确认
                 orderList = receiptMapper.getReceiptOrders(receipt.getId());
                 if ((orderList == null || orderList.size() == 0) && receipt.getReceiptType() == 2) {
-                    if( receipt.getNewReceiptType()==2){
+                    if (receipt.getNewReceiptType() == 2) {
                         orderList = receiptMapper.getReceiptOrderlist(receipt.getId());
                     }
 
                 }
                 log.info("【线下收款】-----已确认--------");
             }
-                if (!CollectionUtils.isEmpty(orderList)) {
-                    List<Integer> clubUserIds = getClubUserIds(receiptUser);
-                    for (OrderVo order : orderList) {
-                        if (4 == receiptUser.getUserType()) {
-                            // 收款详情是否可以查看
-                            order.setAuthority(true);
-                        }
-                        if (null != clubUserIds && clubUserIds.size() > 0 && clubUserIds.contains(order.getUserId())) {
-                            // 收款详情是否可以查看
-                            order.setAuthority(true);
-                        }
-                        // 设置订单的款项信息
-                        setOrderAmountInfo(order);
+            if (!CollectionUtils.isEmpty(orderList)) {
+                List<Integer> clubUserIds = getClubUserIds(receiptUser);
+                for (OrderVo order : orderList) {
+                    if (4 == receiptUser.getUserType()) {
+                        // 收款详情是否可以查看
+                        order.setAuthority(true);
+                    }
+                    if (null != clubUserIds && clubUserIds.size() > 0 && clubUserIds.contains(order.getUserId())) {
+                        // 收款详情是否可以查看
+                        order.setAuthority(true);
                     }
+                    // 设置订单的款项信息
+                    setOrderAmountInfo(order);
+                }
             }
             receipt.setOrderList(orderList);
         }
@@ -1713,25 +1713,25 @@ public class ReceiptServiceImpl implements ReceiptService {
                         }
                     }
                     log.info("************************订单支付完成消息推送*********************");
-                    if(3 == order.getReceiptStatus()) {
+                    if (3 == order.getReceiptStatus()) {
                         List<Integer> productIds = orderClubMapper.getProductOrder(order.getOrderId());
-                        if (0==order.getSecondHandOrderFlag() && 0==order.getRebateFlag() && (null != productIds && !productIds.contains(6060)) ) {
-                            SubmitServiceImpl s=new SubmitServiceImpl();
+                        if (0 == order.getSecondHandOrderFlag() && 0 == order.getRebateFlag() && (null != productIds && !productIds.contains(6060))) {
+                            SubmitServiceImpl s = new SubmitServiceImpl();
                             try {
                                 String accessToken = weChatService.getAccessToken();
                                 List<String> openidList = orderClubMapper.getOpenidListByPermission(orderClubMapper.FromUnionId(order.getOrderId()));
                                 openidList.removeIf(Objects::isNull);
-                                String name= StringUtils.strip(orderClubMapper.getOrderIds(order.getOrderId()).toString().substring(0,11), "[]");
+                                String name = StringUtils.strip(orderClubMapper.getOrderIds(order.getOrderId()).toString().substring(0, 11), "[]");
                                 String associateTitle = "订单支付成功！";
-                                Double money=order.getPayTotalFee();
+                                Double money = order.getPayTotalFee();
                                 String orderno = orderClubMapper.getOrderNo(order.getOrderId());
-                                String paytime=order.getPayTime();
+                                String paytime = order.getPayTime();
                                 String remarkText = "采美将尽快为您安排发货~";
                                 // 跳转到【小程序付款-选择支付方式页面】
-                                String pagePath = "pages/user/order/order-details?type=share&orderId="+order.getOrderId();
+                                String pagePath = "pages/user/order/order-details?type=share&orderId=" + order.getOrderId();
                                 for (String openid : openidList) {
                                     // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
-                                    weChatService.sendTemplateMsgz(accessToken, openid, associateTitle,paytime, name,orderno, money, remarkText, pagePath);
+                                    weChatService.sendTemplateMsgz(accessToken, openid, associateTitle, paytime, name, orderno, money, remarkText, pagePath);
                                 }
                             } catch (Exception e) {
                                 log.error("【订单发货通知】获取微信公众号access_token异常！", e);
@@ -1914,8 +1914,9 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
     public void setReceiptedAmount(ShopOrderVo shopOrder) {
         OrderVo order = orderCommonMapper.getOrderByOrderId(shopOrder.getOrderId());
-    String userName = baseMapper.getUserNameByUserId(order.getUserId());
-    order.setUserName(userName);
+        String userName = baseMapper.getUserNameByUserId(order.getUserId());
+        order.setUserName(userName);
+        order.setPaidAmount(receiptMapper.getPaidAmountByOrderId(order.getOrderId()));
         if (null != order.getRebateFlag() && 1 == order.getRebateFlag()) {
             // 返佣订单
             double needPayAmount = receiptMapper.countNeedPayAmount(order.getOrderId());
@@ -2283,28 +2284,28 @@ public class ReceiptServiceImpl implements ReceiptService {
      * 获取非订单款供应商信息
      */
     @Override
-    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetailVo(String keyWord,int pageNum, int pageSize){
+    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetailVo(String keyWord, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-       List<ShopOrderVo> shopOrder= receiptMapper.ReceiptDetailVo(keyWord);
+        List<ShopOrderVo> shopOrder = receiptMapper.ReceiptDetailVo(keyWord);
         PageInfo<ShopOrderVo> pageInfo = new PageInfo(shopOrder);
         return ResponseJson.success(pageInfo);
     }
 
-   @Override
-    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetail(String keyWord,int pageNum, int pageSize){
-       PageHelper.startPage(pageNum, pageSize);
-            List<ShopOrderVo> shoporder=receiptMapper.ReceiptDetail(keyWord);
-       for (ShopOrderVo shopOrder : shoporder) {
-           setReceiptedAmount(shopOrder);
-       }
-       PageInfo<ShopOrderVo> pageInfo = new PageInfo(shoporder);
+    @Override
+    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetail(String keyWord, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<ShopOrderVo> shoporder = receiptMapper.ReceiptDetail(keyWord);
+        for (ShopOrderVo shopOrder : shoporder) {
+            setReceiptedAmount(shopOrder);
+        }
+        PageInfo<ShopOrderVo> pageInfo = new PageInfo(shoporder);
         return ResponseJson.success(pageInfo);
     }
 
     @Override
-    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetails(String keyWord,int pageNum, int pageSize){
+    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetails(String keyWord, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<ShopOrderVo> shoporder=receiptMapper.ReceiptDetails(keyWord);
+        List<ShopOrderVo> shoporder = receiptMapper.ReceiptDetails(keyWord);
         PageInfo<ShopOrderVo> pageInfo = new PageInfo(shoporder);
         return ResponseJson.success(pageInfo);
     }

src/main/resources/mapper/ReceiptMapper.xml

@@ -1071,7 +1071,8 @@
                u.userName,
                cmo.confirmTime,
                cms.receiptAmount,
-               cms.needPayAmount
+               cms.needPayAmount,
+               cms.payedShopAmount
         FROM cm_shop_order cms
                  LEFT JOIN shop s ON s.shopID = cms.shopID
                  LEFT JOIN cm_order cmo ON cmo.orderID = cms.orderID