协销服务商合并报错解决

src/main/java/com/caimei365/manager/controller/caimei/providers/ProvidersApi.java

@@ -254,13 +254,11 @@ public class ProvidersApi {
     }
 
     @PostMapping("/updateStatus")
-    public ResponseJson providersUpdateStatus(String userIds, Integer status) {
-        if (null == userIds) {
+    public ResponseJson providersUpdateStatus(Integer serviceProviderId, Integer status) {
+        if (null == serviceProviderId) {
             return ResponseJson.error("ID不能为空！");
         }
-        for (String userId : userIds.split(",")) {
-            cmProvidersService.updateCmProviders(new ServiceProviderModel().setUserId(Integer.valueOf(userId)).setStatus(status == 90 ? 90 : 91));
-        }
+        cmProvidersService.updateCmProviders(new ServiceProviderModel().setServiceProviderId(serviceProviderId).setStatus(status));
         return ResponseJson.success();
     }
 

src/main/java/com/caimei365/manager/dao/user/UserMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.caimei365.manager.entity.ZylShop;
 import com.caimei365.manager.entity.caimei.ZylTicket;
 import com.caimei365.manager.entity.caimei.cmUser.User;
+import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -97,4 +98,6 @@ public interface UserMapper
     String findShopIds(Integer userId);
 
     void updateGift(Integer userId);
+
+    void updateCmproviderStatus(ServiceProviderModel cmProviders);
 }

src/main/java/com/caimei365/manager/entity/caimei/providers/ServiceProviderModel.java

@@ -26,6 +26,8 @@ public class ServiceProviderModel {
     private String linkMan;
 
     private String mobile;
+
+    private String password;
     /**
      * 协销Id
      */

src/main/java/com/caimei365/manager/service/caimei/providers/impl/CmProvidersServiceImpl.java

@@ -6,7 +6,6 @@ import java.util.Date;
 import java.util.List;
 
 import com.caimei.utils.AppUtils;
-import com.caimei.utils.MD5Util;
 import com.caimei.utils.StringUtil;
 import com.caimei365.manager.FastDFS.FastDFSClient;
 import com.caimei365.manager.config.utils.DateUtil;
@@ -27,10 +26,10 @@ import com.caimei365.manager.entity.po.UploadFilePo;
 import com.caimei365.manager.service.caimei.providers.CmProvidersContractService;
 import com.caimei365.manager.service.caimei.providers.CmProvidersService;
 import com.caimei365.manager.utils.ImageUtils;
+import com.caimei365.manager.utils.Md5Util;
 import com.caimei365.manager.utils.StringSplitUtils;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -112,13 +111,8 @@ public class CmProvidersServiceImpl implements CmProvidersService {
     public int addCmProviders(ServiceProviderModel cmProviders) {
         if (null == cmProviders.getServiceProviderId()) {
             User user = new User();
-            user.setBindMobile(cmProviders.getMobile());
-            user.setUserName(cmProviders.getLinkMan());
-            user.setName(cmProviders.getName());
-            user.setUserIdentity(9);
-            user.setRegisterUserTypeID("-1");
-            user.setRegisterTime(DateUtil.getDateTime());
-            user.setValidFlag("1");
+            user.setMobile(cmProviders.getMobile()).setBindMobile(cmProviders.getMobile()).setUserName(cmProviders.getLinkMan()).setName(cmProviders.getName()).setServiceProviderStatus(90)
+                    .setUserIdentity(1).setRegisterUserTypeID("-1").setRegisterTime(DateUtil.getDateTime()).setValidFlag("1").setPassword(Md5Util.md5(cmProviders.getPassword()));
             userMapper.addUser(user);
             cmProviders.setUserId(Integer.valueOf(user.getUserID()));
             String qualificationId = "CMFW0" + cmProviders.getServiceLevel();
@@ -133,6 +127,7 @@ public class CmProvidersServiceImpl implements CmProvidersService {
             cmProviders.setQualificationId(qualificationId);
             cmProviders.setStatus(90);
             cmProviders.setAddTime(new Date());
+            log.info("cmProviders--------->" + cmProviders.toString());
             cmProvidersMapper.addCmProviders(cmProviders);   //新增服务商
             String providersId = cmProviders.getServiceProviderId().toString();
             cmProviders.getContract().setServiceProviderId(Integer.valueOf(providersId));
@@ -147,10 +142,7 @@ public class CmProvidersServiceImpl implements CmProvidersService {
             return 1;
         } else {
             User user = new User();
-            user.setBindMobile(cmProviders.getMobile());
-            user.setUserName(cmProviders.getLinkMan());
-            user.setName(cmProviders.getName());
-            user.setValidFlag(cmProviders.getStatus() == 90 ? "1" : "0");
+            user.setMobile(cmProviders.getMobile()).setBindMobile(cmProviders.getMobile()).setUserName(cmProviders.getLinkMan()).setName(cmProviders.getName()).setValidFlag(cmProviders.getStatus() == 90 ? "1" : "0");
             userMapper.updateUser(user);
             String qualificationId = new StringBuffer(cmProviders.getQualificationId()).replace(5, 6, cmProviders.getServiceLevel().toString()).toString();
             cmProviders.setQualificationId(qualificationId);
@@ -165,10 +157,10 @@ public class CmProvidersServiceImpl implements CmProvidersService {
             for (CmRelatedImage infoRelatedImage : cmProviders.getInfoRelateds()) {
                 cmRelatedImageMapper.addCmRelatedImage(cmRelatedImage.setImage(infoRelatedImage.getImage()).setFileName(infoRelatedImage.getFileName()));       //新增服务资料文件
             }
+            log.info("cmProviders--------->" + cmProviders.toString());
             cmProvidersMapper.updateCmProviders(cmProviders);
             CmProvidersContract contract = cmProvidersContractMapper.getByCmProvidersContract(new CmProvidersContract().setServiceProviderId(cmProviders.getServiceProviderId()));
             contract.setFlag(false);//更改新增标识
-            log.info("contract--------->" + contract.toString());
             cmProvidersContractService.addCmProvidersContract(contract); //新增服务商合同
             return 1;
         }
@@ -183,7 +175,7 @@ public class CmProvidersServiceImpl implements CmProvidersService {
     @Override
     public int updateCmProviders(ServiceProviderModel cmProviders) {
         if (null != cmProviders.getStatus()) {
-            userMapper.updateUser(new User().setUserID(String.valueOf(cmProviders.getUserId())).setValidFlag(cmProviders.getStatus() == 90 ? "1" : "0"));
+            userMapper.updateCmproviderStatus(cmProviders);
         }
         return cmProvidersMapper.updateCmProviders(cmProviders);
     }
@@ -255,7 +247,7 @@ public class CmProvidersServiceImpl implements CmProvidersService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseJson updatePassWord(Integer userId, String password) {
-        password = MD5Util.md5ToHex(password);
+        password = Md5Util.md5(password);
         cmProvidersMapper.updatePass(userId, password);
         return ResponseJson.success();
     }

src/main/java/com/caimei365/manager/utils/Md5Util.java

@@ -0,0 +1,62 @@
+package com.caimei365.manager.utils;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.util.UUID;
+
+/**
+ * md5加密工具类
+ *
+ * @author : Charles
+ * @date : 2021/3/3
+ */
+public class Md5Util {
+
+    private static final String HEX_DIGITS = "0123456789ABCDEF";
+
+    /**
+	 * md5加密
+	 * @param s：待加密字符串
+	 * @return 加密后16进制字符串
+	 */
+	public static String md5(String s) {
+	    try {
+	    	//实例化MessageDigest的MD5算法对象
+	        MessageDigest md = MessageDigest.getInstance("MD5");
+	        //通过digest方法返回哈希计算后的字节数组
+	        byte[] bytes = md.digest(s.getBytes(StandardCharsets.UTF_8));
+	        //将字节数组转换为16进制字符串并返回
+	        return toHex(bytes);
+	    }
+	    catch (Exception e) {
+	        throw new RuntimeException(e);
+	    }
+	}
+
+	/**
+	 * 获取随即盐
+	 * @return salt
+	 */
+	public static String salt(){
+		//利用UUID生成随机盐
+		UUID uuid = UUID.randomUUID();
+		//返回a2c64597-232f-4782-ab2d-9dfeb9d76932
+		String[] arr = uuid.toString().split("-");
+		return arr[0];
+	}
+
+	/**
+	 * 字节数组转换为16进制字符串
+	 * @param bytes byte数组
+	 * @return 16进制字符串
+	 */
+	private static String toHex(byte[] bytes) {
+	    final char[] hexDigits = HEX_DIGITS.toCharArray();
+	    StringBuilder ret = new StringBuilder(bytes.length * 2);
+        for (byte aByte : bytes) {
+            ret.append(hexDigits[(aByte >> 4) & 0x0f]);
+            ret.append(hexDigits[aByte & 0x0f]);
+        }
+	    return ret.toString();
+	}
+}

src/main/resources/mapper/providers/CmProvidersMapper.xml

@@ -63,6 +63,7 @@
         sp.createBy,
         sp.addTime,
         sp.splitCode,
+        sp.insiderFlag,
         cm_providers_contract.contractStartDate,
         cm_providers_contract.contractEndDate
         from serviceprovider AS sp
@@ -348,6 +349,7 @@
         insert into serviceprovider
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="serviceProviderId != null and serviceProviderId != ''">id,</if>
+            <if test="insiderFlag != null and insiderFlag != ''">insiderFlag,</if>
             <if test="name != null and name != ''">name,</if>
             <if test="serviceLevel != null">serviceLevel,</if>
             <if test="serviceCategory != null">serviceCategory,</if>
@@ -367,6 +369,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serviceProviderId != null and serviceProviderId != ''">#{serviceProviderId},</if>
+            <if test="insiderFlag != null and insiderFlag != ''">#{insiderFlag},</if>
             <if test="name != null and name != ''">#{name},</if>
             <if test="serviceLevel != null">#{serviceLevel},</if>
             <if test="serviceCategory != null">#{serviceCategory},</if>
@@ -424,6 +427,7 @@
         update serviceprovider
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null and name != ''">name = #{name},</if>
+            <if test="insiderFlag != null and insiderFlag != ''">insiderFlag = #{insiderFlag},</if>
             <if test="serviceLevel != null">serviceLevel = #{serviceLevel},</if>
             <if test="serviceCategory != null">serviceCategory = #{serviceCategory},</if>
             <if test="address != null and address != ''">address = #{address},</if>
@@ -443,7 +447,6 @@
             <if test="splitCode != null and splitCode != ''">splitCode = #{splitCode},</if>
         </trim>
         where serviceProviderID = #{serviceProviderId}
-        <if test="userId != null">or userId = #{userId}</if>
     </update>
 
     <update id="updatePass">

src/main/resources/mapper/user/UserMapper.xml

@@ -503,6 +503,12 @@
         where userId = #{userId}
     </update>
 
+    <update id="updateCmproviderStatus">
+        update user
+        set serviceProviderStatus = #{status}
+        where userId = (select userId from serviceProvider where serviceProviderId = #{serviceProviderId})
+    </update>
+
     <delete id="delUserByUserID" parameterType="String">
         delete
         from user