联合丽格1.0.1

src/main/java/com/caimei/modules/club/dao/CmOperationUserDao.java

@@ -38,6 +38,13 @@ public interface CmOperationUserDao {
      */
     List<NewCmClub> getClubInfo(@Param("spIds") List<Integer> spIds);
 
+    /**
+     * 采购员信息
+     * @param serviceProviderId
+     * @return
+     */
+    CmOrganizeProcure getProcureById(Integer serviceProviderId);
+
     /**
      * 采购员上下线
      * @param status
@@ -45,6 +52,13 @@ public interface CmOperationUserDao {
      */
     void setStatus(@Param("status") Integer status, @Param("serviceProviderId") Integer serviceProviderId);
 
+    /**
+     * 用户采购员上下线状态
+     * @param status
+     * @param serviceProviderId
+     */
+    void setUserServiceStatus(@Param("status") Integer status, @Param("serviceProviderId") Integer serviceProviderId, @Param("userId") Integer userId, @Param("validFlag") Integer validFlag, @Param("userPermission") Integer userPermission);
+
     /**
      * 采购员信息
      * @param serviceProviderId

src/main/java/com/caimei/modules/club/service/impl/CmOperationUserServiceImpl.java

@@ -123,7 +123,16 @@ public class CmOperationUserServiceImpl implements CmOperationUserService {
      */
     @Override
     public ResponseJson setStatus(Integer status, Integer serviceProviderId) {
+        // 获取采购员信息
+        CmOrganizeProcure procure = cmOperationUserDao.getProcureById(serviceProviderId);
+        // 协销上下线状态
         cmOperationUserDao.setStatus(status, serviceProviderId);
+        // 用户协销状态
+        if (90 == status) {
+            cmOperationUserDao.setUserServiceStatus(status, serviceProviderId, procure.getUserId(), 1, 4);
+        } else {
+            cmOperationUserDao.setUserServiceStatus(status, serviceProviderId, procure.getUserId(), 0, 1);
+        }
         return ResponseJson.success();
     }
 
@@ -196,7 +205,6 @@ public class CmOperationUserServiceImpl implements CmOperationUserService {
             cmUser.setClubStatus("90");
             cmUser.setAuditStatus("1");
             cmUser.setValidFlag(1);
-            cmUser.setUserPermission(4);
             cmUser.setAuditTime(dateFormat.format(date));
             cmOperationUserDao.insertUser(cmUser);
             // 添加采购员

src/main/java/com/caimei/modules/order/controller/OrderPayShopController.java

@@ -149,9 +149,9 @@ public class OrderPayShopController {
     }
 
     @ApiOperation("订单收付款记录")
-    @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
-    @GetMapping("/receipt/record/{orderId}/{shopOrderId}")
-    public ResponseJson<Map<String, Object>> findReceiptRecord(@PathVariable Integer orderId,@PathVariable Integer shopOrderId) {
-        return payShopService.findReceiptRecord(orderId,shopOrderId);
+    @ApiImplicitParam(name = "shopOrderId", value = "子订单id", required = true)
+    @GetMapping("/receipt/record/{shopOrderId}")
+    public ResponseJson<Map<String, Object>> findReceiptRecord(@PathVariable Integer shopOrderId) {
+        return payShopService.findReceiptRecord(shopOrderId);
     }
 }

src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -28,6 +28,8 @@ public interface NewOrderDao {
 
     List<NewShopOrder> getShopOrderByOrderId(Integer orderId);
 
+    Integer getOrderById(Integer shopOrderId);
+
     Double getPaidShopAmount(Integer shopOrderId);
 
     void updateShopOrderByPayStatus(Integer shopOrderId, Double paidShop, Integer payStatus);

src/main/java/com/caimei/modules/order/dao/PayShopDao.java

@@ -75,7 +75,7 @@ public interface PayShopDao {
 
     List<SplitRecord> findSplitRecord(Integer orderId);
 
-    List<OrderPayShopRecord> findPayShopRecordsByOrder(Integer orderId);
+    List<OrderPayShopRecord> findPayShopRecordsByOrder(Integer shopOrderId);
 
     void backPayRecord(Integer id);
 

src/main/java/com/caimei/modules/order/entity/NewShopOrder.java

@@ -183,6 +183,10 @@ public class NewShopOrder {
     private String sendOutStatus;
     @ApiModelProperty("收货人")
     private String receiver;
+    @ApiModelProperty("手机")
+    private String mobile;
+    @ApiModelProperty("地址")
+    private String address;
     @ApiModelProperty("'0'=不是邮费商品子订单; '1'=是邮费商品子订单")
     private String postFeeCos = "0";
     @ApiModelProperty("机构名称")

src/main/java/com/caimei/modules/order/service/PayShopService.java

@@ -37,7 +37,7 @@ public interface PayShopService {
 
     ResponseJson<Map<String,Object>> findSplitRecord(Integer orderId);
 
-    ResponseJson<Map<String,Object>> findReceiptRecord(Integer orderId,Integer shopOrderId);
+    ResponseJson<Map<String,Object>> findReceiptRecord(Integer shopOrderId);
 
     ResponseJson backPay(Integer id);
 

src/main/java/com/caimei/modules/order/service/impl/PayShopServiceImpl.java

@@ -491,19 +491,23 @@ public class PayShopServiceImpl implements PayShopService {
     }
 
     @Override
-    public ResponseJson<Map<String, Object>> findReceiptRecord(Integer orderId,Integer shopOrderId) {
+    public ResponseJson<Map<String, Object>> findReceiptRecord(Integer shopOrderId) {
         Map<String, Object> val = new HashMap<>(3);
+        // 根据子订单Id查询主订单
+        Integer orderId = newOrderDao.getOrderById(shopOrderId);
         //过滤子订单
         NewOrder newOrder = newOrderDao.get(orderId.toString());
         orderUtils.setReceiverVal(newOrder);
         orderUtils.setOrderValue(newOrder);
-
-        List<NewShopOrder>  newShopOrders= newOrder.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderId().equals(shopOrderId)).collect(Collectors.toList());
+        // 设置子订单信息
+        List<NewShopOrder> newShopOrders = newOrder.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderId().equals(shopOrderId)).collect(Collectors.toList());
         newOrder.setNewShopOrders(newShopOrders);
+        // 设置运费展示信息
         if(newOrder.getNewShopOrders()!=null&&newOrder.getNewShopOrders().size()>0){
             newOrder.getNewShopOrders().get(0).setPostageInfo(newOrder.getPostageInfo());
         }
-        val.put("order", newOrder);
+
+        val.put("shopOrder", newShopOrders.get(0));
         newOrder.setShopOrderId(shopOrderId);
         List<ReceiptVo> receiptVos = orderUtils.getReceiptRecord(newOrder);
         val.put("receiptList", receiptVos);

src/main/java/com/caimei/modules/order/util/OrderUtils.java

@@ -397,6 +397,12 @@ public class OrderUtils {
         order.setPaidAmount(MathUtil.add(totalPaidCm, totalPaidShop).doubleValue());
         setRefundVal(order);
         setOrderPostInfo(order);
+        // 设置基础信息
+        shopOrders.forEach(shopOrder -> {
+            shopOrder.setReceiver(order.getReceiver());
+            shopOrder.setMobile(order.getMobile());
+            shopOrder.setAddress(order.getAddress());
+        });
         return order;
     }
 
@@ -511,7 +517,7 @@ public class OrderUtils {
     }
 
     public List<OrderPayShopRecord> getPayRecords(NewOrder newOrder) {
-        return payShopDao.findPayShopRecordsByOrder(newOrder.getOrderId());
+        return payShopDao.findPayShopRecordsByOrder(newOrder.getShopOrderId());
     }
 
     public Boolean setDeliverStatus(List<NewOrderProduct> orderProducts) {

src/main/resources/mapper/CmDiscernReceiptMapper.xml

@@ -62,8 +62,7 @@
         cr.organizeId AS organizeId,
         cr.orderNo,
         cr.orderType,
-        (CASE WHEN cr.orderType = '0' THEN
-        ( CASE sp.status WHEN 91 THEN '默认采购员(官方账号)' ELSE sp.linkMan END )
+        (CASE WHEN cr.orderType = '0' THEN sp.linkMan
         ELSE ''
         END) AS spName,
         c.name as clubName
@@ -141,8 +140,7 @@
         cr.organizeId AS organizeId,
         cr.orderNo,
         cr.orderType,
-        (CASE WHEN cr.orderType = '0' THEN
-        ( CASE sp.status WHEN 91 THEN '默认采购员(官方账号)' ELSE sp.linkMan END )
+        (CASE WHEN cr.orderType = '0' THEN sp.linkMan
         ELSE ''
         END) AS spName,
         c.name as clubName
@@ -245,8 +243,7 @@
                c.name       AS clubName,
                co.receiptStatus,
                co.orderTime,
-               (CASE WHEN co.orderType = '0' THEN
-                         ( CASE sp.status WHEN 91 THEN '默认采购员(官方账号)' ELSE sp.linkMan END )
+               (CASE WHEN co.orderType = '0' THEN sp.linkMan
                      ELSE ''
                    END) AS spName
         from cm_order co

src/main/resources/mapper/CmOperationUserMapper.xml

@@ -216,11 +216,34 @@
             </if>
         </where>
     </select>
+    <select id="getProcureById" resultType="com.caimei.modules.club.entity.CmOrganizeProcure">
+        SELECT
+            a.serviceProviderID AS "serviceProviderId",
+            a.userID AS "userID",
+            a.organizeID as organizeId,
+            a.name AS "name",
+            a.linkMan AS "linkMan",
+            a.contractMobile AS "mobile",
+            a.status AS "status",
+            cmou.id AS "operaId",
+            cmou.bindTime AS "bindTime",
+            a.addTime AS "addTime"
+        FROM serviceprovider a
+        LEFT JOIN cm_mall_operation_user cmou ON a.userId = cmou.userId
+        where a.serviceProviderID = #{serviceProviderId}
+    </select>
     <update id="setStatus">
         update serviceprovider
         set status = #{status}
         where serviceProviderID = #{serviceProviderId}
     </update>
+    <select id="setUserServiceStatus">
+        update user
+        set serviceProviderStatus = #{status},
+            userPermission = #{userPermission},
+            validFlag = #{validFlag}
+        where userId = #{userId}
+    </select>
     <select id="getProcureInfo" resultType="com.caimei.modules.club.entity.CmOrganizeProcure">
         select serviceProviderID AS serviceProviderId,
                userID AS userID,

src/main/resources/mapper/CmUserMapper.xml

@@ -20,7 +20,7 @@
         a.userId,
         c.checkMan,
         c.auditTime,
-        CASE sp.status WHEN 91 THEN '默认采购员(官方账号)' ELSE sp.linkMan END AS "spName"
+        sp.linkMan AS "spName"
         FROM club c
         LEFT JOIN user a on c.userId = a.userId
         LEFT JOIN serviceprovider sp ON sp.serviceProviderID = c.spID

src/main/resources/mapper/NewOrderMapper.xml

@@ -294,8 +294,7 @@
         co.postageOrderFlag AS postageOrderFlag,
         co.orderSource AS orderSource,
         c.name as clubName,
-        (CASE WHEN co.orderType = '0' THEN
-            ( CASE sp.status WHEN 91 THEN '默认采购员(官方账号)' ELSE sp.linkMan END )
+        (CASE WHEN co.orderType = '0' THEN sp.linkMan
             ELSE ''
             END) AS spName,
         (SELECT IF(COUNT(orderId)>0,1,0) FROM cm_returned_purchase
@@ -439,12 +438,12 @@
         <include refid="columns"/>
         ,c.name as clubName,
         a.orderType as orderType,
-        (CASE WHEN co.orderType = '0' THEN
-            ( CASE sp.status WHEN 91 THEN '默认采购员(官方账号)' ELSE sp.linkMan END )
+        (CASE WHEN a.orderType = '0' THEN sp.linkMan
             ELSE ''
             END) AS spName
         FROM cm_order a
         left join club c on a.userId = c.userId
+        LEFT JOIN serviceprovider sp ON c.spID = sp.serviceProviderID
         WHERE a.orderId = #{id}
     </select>
 
@@ -559,6 +558,10 @@
           AND orderId = #{orderId}
     </select>
 
+    <select id="getOrderById" resultType="java.lang.Integer">
+        select orderId from cm_shop_order where shopOrderId = #{shopOrderId} limit 1
+    </select>
+
     <select id="getPaidShopAmount" resultType="java.lang.Double">
         SELECT ifnull(SUM(payAmount),0)
         FROM cm_pay_shop_record

src/main/resources/mapper/PayShopDao.xml

@@ -576,7 +576,7 @@
         FROM cm_pay_shop_record a
         LEFT JOIN cm_offline_collection f ON a.payType = f.type
         left join cm_pay_shop cps on a.shopID = cps.shopID
-        WHERE a.shopOrderID in (select shopOrderId from cm_shop_order where orderId = #{orderId})
+        WHERE a.shopOrderID = #{shopOrderId}
           and a.delFlag = 0
           and cps.delFlag = 0
           and a.status = 1