非订单款-二级类别

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

@@ -414,5 +414,31 @@ public class ReceiptApi {
         return receiptService.receiptAudit(receiptOperateDto.getId(), receiptOperateDto.getReceiptStatus(), receiptOperateDto.getReviewReason(), headers);
     }
 
+
+    @ApiOperation("待确认订单款供应商信息")
+    @GetMapping("/shop")
+    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetailVo(String keyWord,Integer newReceiptType,@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                           @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+
+        if(newReceiptType ==2){
+            return receiptService.ReceiptDetails(keyWord,pageNum,pageSize);
+        }else {return receiptService.ReceiptDetailVo(keyWord,pageNum,pageSize);}
+    }
+
+    @ApiOperation("订单返佣-非返佣订单信息")
+    @GetMapping("/shoporder")
+    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetail(String keyWord,@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+
+        return receiptService.ReceiptDetail(keyWord,pageNum,pageSize);
+    }
+//    @ApiOperation("认证通会员-非返佣订单信息")
+//    @GetMapping("/shoporders")
+//    public ResponseJson<List<ShopOrderVo>> ReceiptDetails(String keyWord) {
+//
+//        return receiptService.ReceiptDetails(keyWord);
+//    }
+
+
+
 }
 

src/main/java/com/caimei365/order/mapper/ReceiptMapper.java

@@ -102,6 +102,10 @@ public interface ReceiptMapper {
      * 获取收款关联订单
      */
     List<OrderVo> getReceiptOrders(Integer receiptId);
+
+    List<OrderVo> getReceiptOrderlist(Integer receiptId);
+
+    List<OrderVo> getReceiptOrderlists(Integer receiptId);
     /**
      * 获取收款商品订单列表
      */
@@ -211,4 +215,12 @@ public interface ReceiptMapper {
      * 更新供应商欠款金额
      */
     void updateShopRebateAmount(Integer shopId, Double amount);
+
+    List<ShopOrderVo>ReceiptDetailVo(String keyWord);
+
+    List<ShopOrderVo> ReceiptDetail(String keyWord);
+
+    List<ShopOrderVo> ReceiptDetails(String keyWord);
+
+
 }

src/main/java/com/caimei365/order/model/dto/ReceiptOperateDto.java

@@ -76,4 +76,20 @@ public class ReceiptOperateDto implements Serializable {
      */
     @ApiModelProperty("口头返佣佣金")
     private Double verbalAmount;
+    /**
+     * 收款款项二级类别
+     */
+    @ApiModelProperty("收款款项二级类别1.上架费2.订单返佣3.认证通会员4.认证通企划")
+    private Integer newReceiptType;
+    /**
+     * 关联供应ID
+     */
+    @ApiModelProperty("关联供应商ID")
+    private Integer shopId;
+    /**
+     * 关联供应商id
+     */
+    @ApiModelProperty("关联供应商name")
+    private String shopName;
+
 }

src/main/java/com/caimei365/order/model/po/ReceiptPo.java

@@ -122,5 +122,21 @@ public class ReceiptPo implements Serializable {
      * 返佣关联备注
      */
     private String rebateRemarks;
+    /**
+     * 收款款项二级类别
+     */
+    private Integer newReceiptType;
+    /**
+     * 关联供ID
+     */
+    private Integer shopId;
+    /**
+     * 关联子订单ID
+     */
+    private Integer shopOrderId;
+    /**
+     * 关联供应商id
+     */
+    private String shopName;
 
 }

src/main/java/com/caimei365/order/model/vo/OrderVo.java

@@ -315,4 +315,13 @@ public class OrderVo implements Serializable {
      * 总税费
      */
     private Double totalAddedValueTax;
+
+    /**
+     * 供应商名称
+     */
+    private String shopName;
+    /**
+     * 收款款项二级类别1.上架费2.订单返佣3.认证通会员4.认证通企划
+     */
+    private Integer newReceiptType;
 }

src/main/java/com/caimei365/order/model/vo/ReceiptVo.java

@@ -146,4 +146,8 @@ public class ReceiptVo implements Serializable {
     private Integer cancelUserPermissionId;
     private String cancelUserName;
 
+    private Integer newReceiptType;
+
+    private String shopName;
+
 }

src/main/java/com/caimei365/order/model/vo/ShopOrderVo.java

@@ -219,4 +219,24 @@ public class ShopOrderVo implements Serializable {
      * 子订单分帐号
      */
     private String splitCode;
+    /**
+     * 供应商联系人
+     */
+    private String linkMan;
+    /**
+     * 供应商手机号
+     */
+    private String contractMobile;
+    /**
+     * 客户名称
+     */
+    private String userName;
+    /**
+     * 下单日期
+     */
+    private String confirmTime;
+    /**
+     * 收款款项二级类别1.上架费2.订单返佣3.认证通会员4.认证通企划
+     */
+   private Integer newReceiptType;
 }

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

@@ -208,6 +208,11 @@ public interface ReceiptService {
      */
     ResponseJson<Void> receiptAudit(Integer id, Integer receiptStatus, String reviewReason, HttpHeaders headers);
 
+    ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetailVo(String keyWord,int pageNum, int pageSize);
+
+    ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetail(String keyWord,int pageNum, int pageSize);
+
+    ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetails(String keyWord,int pageNum, int pageSize);
     /**
      * 微信收款信息推送(待确认超时)
      */

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

@@ -495,7 +495,15 @@ 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 {
+                receiptPo.setShopId(receiptOperateDto.getShopId());
+                receiptPo.setShopName(receiptOperateDto.getShopName());
+            }
             receiptPo.setReceiptStatus(2);
+
+            receiptPo.setNewReceiptType(receiptOperateDto.getNewReceiptType());
             receiptPo.setConfirmUserPermissionId(receiptUser.getId());
             receiptPo.setConfirmDate(time);
         }
@@ -661,22 +669,28 @@ public class ReceiptServiceImpl implements ReceiptService {
             } else {
                 // 已确认
                 orderList = receiptMapper.getReceiptOrders(receipt.getId());
+                if ((orderList == null || orderList.size() == 0) && receipt.getReceiptType() == 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);
+                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);
                     }
-                    // 设置订单的款项信息
-                    setOrderAmountInfo(order);
-                }
             }
             receipt.setOrderList(orderList);
         }
@@ -1899,8 +1913,8 @@ 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);
         if (null != order.getRebateFlag() && 1 == order.getRebateFlag()) {
             // 返佣订单
             double needPayAmount = receiptMapper.countNeedPayAmount(order.getOrderId());
@@ -2264,4 +2278,34 @@ public class ReceiptServiceImpl implements ReceiptService {
         return returnedAmount;
     }
 
+    /**
+     * 获取非订单款供应商信息
+     */
+    @Override
+    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetailVo(String keyWord,int pageNum, int pageSize){
+        PageHelper.startPage(pageNum, pageSize);
+       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);
+        return ResponseJson.success(pageInfo);
+    }
+
+    @Override
+    public ResponseJson<PageInfo<ShopOrderVo>> ReceiptDetails(String keyWord,int pageNum, int pageSize){
+        PageHelper.startPage(pageNum, pageSize);
+        List<ShopOrderVo> shoporder=receiptMapper.ReceiptDetails(keyWord);
+        PageInfo<ShopOrderVo> pageInfo = new PageInfo(shoporder);
+        return ResponseJson.success(pageInfo);
+    }
+
 }