联合丽格1.0.1 封存

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

@@ -89,6 +89,12 @@ public interface CmOperationUserDao {
      */
     void updateProcure(CmOrganizeProcure cmOrganizeProcure);
 
+    /**
+     * 修改用户协销Id
+     * @param serviceProviderId
+     * @param userId
+     */
+    void updateUserSpId(@Param("serviceProviderId") Integer serviceProviderId,@Param("userId") Integer userId);
     /**
      * 机构采购员
      * @param serviceProviderId

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

@@ -185,6 +185,7 @@ public class CmOperationUserServiceImpl implements CmOperationUserService {
             cmUser.setPassword(MD5Util.md5("1111aaaa"));
             cmUser.setUserOrganizeId(cmOrganizeProcure.getOrganizeId());
             cmUser.setMobile(cmOrganizeProcure.getMobile());
+            cmUser.setBindMobile(cmOrganizeProcure.getMobile());
             cmUser.setUserIdentity(1);
             cmUser.setRegisterTime(dateFormat.format(date));
             cmUser.setServiceProviderStatus("90");
@@ -192,9 +193,9 @@ public class CmOperationUserServiceImpl implements CmOperationUserService {
             cmUser.setRealName(cmOrganizeProcure.getName());
             cmUser.setUserName(cmOrganizeProcure.getName());
             cmUser.setName(cmOrganizeProcure.getName());
+            cmUser.setClubStatus("90");
             cmUser.setAuditStatus("1");
             cmUser.setValidFlag(1);
-            cmUser.setServiceProviderStatus("90");
             cmUser.setUserPermission(4);
             cmUser.setAuditTime(dateFormat.format(date));
             cmOperationUserDao.insertUser(cmUser);
@@ -207,6 +208,8 @@ public class CmOperationUserServiceImpl implements CmOperationUserService {
             cmOrganizeProcure.setAuditTime(dateFormat.format(date));
             cmOrganizeProcure.setLinkMan(cmOrganizeProcure.getName());
             cmOperationUserDao.insertProcure(cmOrganizeProcure);
+            // 采购员id
+            cmOperationUserDao.updateUserSpId(cmOrganizeProcure.getServiceProviderId(),cmUser.getUserId());
             // 修改机构采购员
             if (null != cmOrganizeProcure.getClubList()) {
                 List<Integer> collect = cmOrganizeProcure.getClubList().stream().map(NewCmClub::getClubId).collect(Collectors.toList());

src/main/resources/mapper/CmDiscernReceiptMapper.xml

@@ -72,6 +72,7 @@
         LEFT JOIN cm_shop_order cso ON cso.shopOrderId = crr.orderId
         LEFT JOIN cm_order cr ON cr.orderId = cso.orderId
         LEFT JOIN club c ON cr.userId = c.userId
+        left join serviceprovider sp ON c.spID = sp.serviceProviderID
         LEFT JOIN cm_offline_collection cof ON a.payType = cof.type
         <where>
             crr.relationType = 1
@@ -108,6 +109,9 @@
             <if test="receiptProgress != null">
                 AND cr.receiptStatus = #{receiptProgress}
             </if>
+            <if test="orderType != null">
+                AND cr.orderType = #{orderType}
+            </if>
             <if test="associationNum != null and associationNum != ''">
                 <if test="associationNum == 1">
                     and (select count(1) from cm_receipt_order_relation where receiptId = a.id and delFlag = '0') = 1
@@ -137,12 +141,18 @@
         cof.bankAccount AS bankNameType,
         cr.organizeId AS organizeId,
         cr.orderNo,
+        cr.orderType,
+        (CASE WHEN cr.orderType = '0' THEN
+        ( CASE sp.status WHEN 91 THEN '默认采购员(官方账号)' ELSE sp.linkMan END )
+        ELSE ''
+        END) AS spName,
         c.name as clubName
         FROM cm_discern_receipt a
         LEFT JOIN cm_receipt_order_relation crr ON crr.receiptId = a.id AND crr.delFlag = '0'
         LEFT JOIN cm_order cr ON cr.orderId = crr.orderId
         LEFT JOIN cm_shop_order cso ON cso.orderId = cr.orderId
         LEFT JOIN club c ON cr.userId = c.userId
+        left join serviceprovider sp ON c.spID = sp.serviceProviderID
         LEFT JOIN cm_offline_collection cof ON a.payType = cof.type
         <where>
             crr.relationType != 1

src/main/resources/mapper/CmOperationUserMapper.xml

@@ -374,6 +374,11 @@
            status = #{status}
         WHERE serviceProviderID = #{serviceProviderId}
     </update>
+    <update id="updateUserSpId">
+        update user
+        set spId = #{serviceProviderId}
+        where userId = #{userId}
+    </update>
     <update id="updateClub">
         update club
         set spId = #{serviceProviderId}