协销服务商合并报错解决

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

@@ -219,15 +219,15 @@ public class ProvidersApi {
                                               @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         List<CmProvidersContract> cmProvidersContractList = cmProvidersContractService.getCmProvidersContractList(
-                new CmProvidersContract().setContractId(contractId).setProvidersId(serviceProviderId)
+                new CmProvidersContract().setContractId(contractId).setServiceProviderId(serviceProviderId)
                         .setContractStartDate(contractStartDate).setContractEndDate(contractEndDate));
         return ResponseJson.success(new PaginationVo(cmProvidersContractList));
     }
 
     @GetMapping("/from")
-    public ResponseJson providersFrom(String serviceProvidersId) {
-        if (StringUtils.isBlank(serviceProvidersId)) {
-            return ResponseJson.error("参数异常！");
+    public ResponseJson providersFrom(Integer serviceProvidersId) {
+        if (null == serviceProvidersId) {
+            return ResponseJson.error("协销Id不为空！");
         }
         ServiceProviderModel providers = cmProvidersService.getCmProvidersById(serviceProvidersId);
         return ResponseJson.success(providers);
@@ -266,7 +266,7 @@ public class ProvidersApi {
 
     @PostMapping("/contract/add")
     public ResponseJson providersContractAdd(@RequestBody CmProvidersContract cmProvidersContract) {
-        if (null == cmProvidersContract.getProvidersId() || null == cmProvidersContract.getContractId()
+        if (null == cmProvidersContract.getServiceProviderId() || null == cmProvidersContract.getContractId()
                 || null == cmProvidersContract.getContractStartDate()
                 || null == cmProvidersContract.getContractEndDate() || null == cmProvidersContract.getContractRelateds()) {
             return ResponseJson.error("参数异常！");

src/main/java/com/caimei365/manager/dao/providers/CmProvidersMapper.java

@@ -32,7 +32,7 @@ public interface CmProvidersMapper {
      * @param id 主键
      * @return
      */
-    ServiceProviderModel getCmProvidersById(String id);
+    ServiceProviderModel getCmProvidersById(Integer id);
 
     /**
      * 通过对象查询对象

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

@@ -32,7 +32,7 @@ public class CmProvidersContract implements Serializable {
     /**
      * 服务商id
      */
-    private Integer providersId;
+    private Integer serviceProviderId;
 
     /**
      * 合同编号

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

@@ -19,6 +19,8 @@ import java.util.List;
 @Data
 public class ServiceProviderModel {
 
+    private Integer insiderFlag;
+
     private Integer leaderId;
 
     private String linkMan;

src/main/java/com/caimei365/manager/service/caimei/providers/CmProvidersService.java

@@ -32,7 +32,7 @@ public interface CmProvidersService {
      * @param id 主键
      * @return
      */
-    ServiceProviderModel getCmProvidersById(String id);
+    ServiceProviderModel getCmProvidersById(Integer id);
 
     /**
      * 通过对象查询

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

@@ -14,6 +14,7 @@ import com.caimei365.manager.entity.caimei.providers.ServiceProviderModel;
 import com.caimei365.manager.service.caimei.providers.CmProvidersContractService;
 import com.caimei365.manager.utils.ImageUtils;
 import com.caimei365.manager.service.caimei.providers.utils.ProvidersTemplate;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -25,6 +26,7 @@ import javax.annotation.Resource;
  * @author Kaick
  * @date 2023-12-12
  */
+@Slf4j
 @Service
 public class CmProvidersContractServiceImpl implements CmProvidersContractService {
     @Resource
@@ -83,11 +85,12 @@ public class CmProvidersContractServiceImpl implements CmProvidersContractServic
     @Transactional(rollbackFor = Exception.class)
     @Override
     public int addCmProvidersContract(CmProvidersContract cmProvidersContract) {
-        ServiceProviderModel cmProviders = cmProvidersMapper.getCmProvidersById(String.valueOf(cmProvidersContract.getProvidersId()));
+        ServiceProviderModel cmProviders = cmProvidersMapper.getCmProvidersById(cmProvidersContract.getServiceProviderId());
+        log.info("cmProviders_------------->" + cmProviders.toString());
         String levelName = cmProviders.getServiceLevel() == 1 ? "一级" : cmProviders.getServiceLevel() == 2 ? "二级" : cmProviders.getServiceLevel() == 3 ? "三级" : cmProviders.getBrandName();
-        BufferedImage realQrCodeImage = ImageUtils.createRealQrCode("https://www.caimei365.com/settlementInfo.html?id=" + cmProvidersContract.getProvidersId(), 1000);                //生成二维码
+        BufferedImage realQrCodeImage = ImageUtils.createRealQrCode("https://www.caimei365.com/settlementInfo.html?id=" + cmProvidersContract.getServiceProviderId(), 1000);                //生成二维码
         cmProvidersMapper.updateCmProviders(new ServiceProviderModel()
-                .setServiceProviderId(cmProvidersContract.getProvidersId())
+                .setServiceProviderId(cmProvidersContract.getServiceProviderId())
                 .setQrCodeImage(FastDFSClient.saveImage(realQrCodeImage))
                 .setQualificationImage(ProvidersTemplate.setQualificationImage(cmProviders.getServiceLevel(),
                         cmProviders.getName().replace("公司", ""),    //生成资格证书

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

@@ -79,7 +79,7 @@ public class CmProvidersServiceImpl implements CmProvidersService {
      * @return
      */
     @Override
-    public ServiceProviderModel getCmProvidersById(String id) {
+    public ServiceProviderModel getCmProvidersById(Integer id) {
         ServiceProviderModel cmProvidersById = cmProvidersMapper.getCmProvidersById(id);
         cmProvidersById.setTextRelateds(cmRelatedImageMapper.getRelatedImageList(new CmRelatedImage().setType("2").setAuthorId(cmProvidersById.getServiceProviderId().toString())));
         cmProvidersById.setInfoRelateds(cmRelatedImageMapper.getRelatedImageList(new CmRelatedImage().setType("3").setAuthorId(cmProvidersById.getServiceProviderId().toString())));
@@ -110,7 +110,7 @@ public class CmProvidersServiceImpl implements CmProvidersService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public int addCmProviders(ServiceProviderModel cmProviders) {
-        if (StringUtils.isBlank(cmProviders.getServiceProviderId().toString())) {
+        if (null == cmProviders.getServiceProviderId()) {
             User user = new User();
             user.setBindMobile(cmProviders.getMobile());
             user.setUserName(cmProviders.getLinkMan());
@@ -135,7 +135,7 @@ public class CmProvidersServiceImpl implements CmProvidersService {
             cmProviders.setAddTime(new Date());
             cmProvidersMapper.addCmProviders(cmProviders);   //新增服务商
             String providersId = cmProviders.getServiceProviderId().toString();
-            cmProviders.getContract().setProvidersId(Integer.valueOf(providersId));
+            cmProviders.getContract().setServiceProviderId(Integer.valueOf(providersId));
             cmProviders.getContract().setCreateBy(cmProviders.getCreateBy());
             cmProvidersContractService.addCmProvidersContract(cmProviders.getContract()); //新增服务商合同
             for (CmRelatedImage textRelatedImage : cmProviders.getTextRelateds()) {
@@ -166,8 +166,9 @@ public class CmProvidersServiceImpl implements CmProvidersService {
                 cmRelatedImageMapper.addCmRelatedImage(cmRelatedImage.setImage(infoRelatedImage.getImage()).setFileName(infoRelatedImage.getFileName()));       //新增服务资料文件
             }
             cmProvidersMapper.updateCmProviders(cmProviders);
-            CmProvidersContract contract = cmProvidersContractMapper.getByCmProvidersContract(new CmProvidersContract().setProvidersId(cmProviders.getServiceProviderId()));
+            CmProvidersContract contract = cmProvidersContractMapper.getByCmProvidersContract(new CmProvidersContract().setServiceProviderId(cmProviders.getServiceProviderId()));
             contract.setFlag(false);//更改新增标识
+            log.info("contract--------->" + contract.toString());
             cmProvidersContractService.addCmProvidersContract(contract); //新增服务商合同
             return 1;
         }

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

@@ -4,21 +4,10 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.manager.dao.providers.CmProvidersContractMapper">
 
-    <resultMap type="CmProvidersContract" id="CmProvidersContractResult">
-        <result property="id"    column="id"    />
-        <result property="providersId"    column="providersId"    />
-        <result property="contractId"    column="contractId"    />
-        <result property="contractStartDate"    column="contractStartDate"    />
-        <result property="contractEndDate"    column="contractEndDate"    />
-        <result property="createBy"    column="createBy"    />
-        <result property="updateTime"    column="updateTime"    />
-        <result property="createTime"    column="createTime"    />
-    </resultMap>
-
     <sql id="selectCmProvidersContractVo">
         select
             cm_providers_contract.id,
-            cm_providers_contract.providersId,
+            cm_providers_contract.providersId as serviceProviderId,
             cm_providers_contract.contractId,
             cm_providers_contract.contractStartDate,
             cm_providers_contract.contractEndDate,
@@ -27,26 +16,34 @@
             cm_providers_contract.createTime
     </sql>
 
-    <select id="getByCmProvidersContract" parameterType="CmProvidersContract" resultMap="CmProvidersContractResult">
-        <include refid="selectCmProvidersContractVo"/>
-        from cm_providers_contract AS cm_providers_contract
+    <select id="getByCmProvidersContract" parameterType="CmProvidersContract" resultType="com.caimei365.manager.entity.caimei.providers.CmProvidersContract">
+        select
+        id,
+        providersId as serviceProviderId,
+        contractId,
+        contractStartDate,
+        contractEndDate,
+        createBy,
+        updateTime,
+        createTime
+        from cm_providers_contract
         <where>
-            <if test="id != null  and id != ''"> and cm_providers_contract.id = #{id}</if>
-            <if test="providersId != null "> and cm_providers_contract.providersId = #{providersId}</if>
-            <if test="contractId != null  and contractId != ''"> and cm_providers_contract.contractId = #{contractId}</if>
-            <if test="contractStartDate != null "> and cm_providers_contract.contractStartDate = #{contractStartDate}</if>
-            <if test="contractEndDate != null "> and cm_providers_contract.contractEndDate = #{contractEndDate}</if>
+            <if test="id != null  and id != ''"> and id = #{id}</if>
+            <if test="serviceProviderId != null "> and providersId = #{serviceProviderId}</if>
+            <if test="contractId != null  and contractId != ''"> and contractId = #{contractId}</if>
+            <if test="contractStartDate != null "> and contractStartDate = #{contractStartDate}</if>
+            <if test="contractEndDate != null "> and contractEndDate = #{contractEndDate}</if>
         </where>
         group by cm_providers_contract.id
         limit 0,1
     </select>
 
-    <select id="getCmProvidersContractList" parameterType="CmProvidersContract" resultMap="CmProvidersContractResult">
+    <select id="getCmProvidersContractList" parameterType="CmProvidersContract" resultType="com.caimei365.manager.entity.caimei.providers.CmProvidersContract">
         <include refid="selectCmProvidersContractVo"/>
         from cm_providers_contract AS cm_providers_contract
         <where>
             <if test="id != null  and id != ''"> and cm_providers_contract.id = #{id}</if>
-            <if test="providersId != null "> and cm_providers_contract.providersId = #{providersId}</if>
+            <if test="serviceProviderId != null "> and cm_providers_contract.providersId = #{serviceProviderId}</if>
             <if test="contractId != null  and contractId != ''"> and cm_providers_contract.contractId = #{contractId}</if>
             <if test="contractStartDate != null "> and cm_providers_contract.contractStartDate >= #{contractStartDate}</if>
             <if test="contractEndDate != null "> and cm_providers_contract.contractEndDate  <![CDATA[ <= ]]> #{contractEndDate}</if>
@@ -60,14 +57,14 @@
         from cm_providers_contract AS cm_providers_contract
         <where>
             <if test="id != null  and id != ''"> and cm_providers_contract.id = #{id}</if>
-            <if test="providersId != null "> and cm_providers_contract.providersId = #{providersId}</if>
+            <if test="serviceProviderId != null "> and cm_providers_contract.providersId = #{serviceProviderId}</if>
             <if test="contractId != null  and contractId != ''"> and cm_providers_contract.contractId = #{contractId}</if>
             <if test="contractStartDate != null "> and cm_providers_contract.contractStartDate = #{contractStartDate}</if>
             <if test="contractEndDate != null "> and cm_providers_contract.contractEndDate = #{contractEndDate}</if>
         </where>
     </select>
 
-    <select id="getCmProvidersContractById" parameterType="String" resultMap="CmProvidersContractResult">
+    <select id="getCmProvidersContractById" parameterType="String" resultType="com.caimei365.manager.entity.caimei.providers.CmProvidersContract">
         <include refid="selectCmProvidersContractVo"/>
         from cm_providers_contract AS cm_providers_contract
         where  cm_providers_contract.id = #{id}
@@ -79,7 +76,7 @@
         from cm_providers_contract AS cm_providers_contract
         <where>
             <if test="id != null  and id != ''"> and cm_providers_contract.id = #{id}</if>
-            <if test="providersId != null "> and cm_providers_contract.providersId = #{providersId}</if>
+            <if test="serviceProviderId != null "> and cm_providers_contract.providersId = #{serviceProviderId}</if>
             <if test="contractId != null  and contractId != ''"> and cm_providers_contract.contractId = #{contractId}</if>
             <if test="contractStartDate != null "> and cm_providers_contract.contractStartDate = #{contractStartDate}</if>
             <if test="contractEndDate != null "> and cm_providers_contract.contractEndDate = #{contractEndDate}</if>
@@ -92,7 +89,7 @@
         insert into cm_providers_contract
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">id,</if>
-            <if test="providersId != null">providersId,</if>
+            <if test="serviceProviderId != null">providersId,</if>
             <if test="contractId != null and contractId != ''">contractId,</if>
             <if test="contractStartDate != null">contractStartDate,</if>
             <if test="contractEndDate != null">contractEndDate,</if>
@@ -102,7 +99,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null and id != ''">#{id},</if>
-            <if test="providersId != null">#{providersId},</if>
+            <if test="serviceProviderId != null">#{serviceProviderId},</if>
             <if test="contractId != null and contractId != ''">#{contractId},</if>
             <if test="contractStartDate != null">#{contractStartDate},</if>
             <if test="contractEndDate != null">#{contractEndDate},</if>
@@ -115,7 +112,7 @@
     <update id="updateCmProvidersContract" parameterType="CmProvidersContract">
         update cm_providers_contract
         <trim prefix="SET" suffixOverrides=",">
-            <if test="providersId != null">providersId = #{providersId},</if>
+            <if test="serviceProviderId != null">providersId = #{serviceProviderId},</if>
             <if test="contractId != null and contractId != ''">contractId = #{contractId},</if>
             <if test="contractStartDate != null">contractStartDate = #{contractStartDate},</if>
             <if test="contractEndDate != null">contractEndDate = #{contractEndDate},</if>
@@ -136,7 +133,7 @@
         from cm_providers_contract AS cm_providers_contract
         <where>
             <if test="id != null  and id != ''"> and cm_providers_contract.id = #{id}</if>
-            <if test="providersId != null "> and cm_providers_contract.providersId = #{providersId}</if>
+            <if test="serviceProviderId != null "> and cm_providers_contract.providersId = #{serviceProviderId}</if>
             <if test="contractId != null  and contractId != ''"> and cm_providers_contract.contractId = #{contractId}</if>
             <if test="contractStartDate != null "> and cm_providers_contract.contractStartDate = #{contractStartDate}</if>
             <if test="contractEndDate != null "> and cm_providers_contract.contractEndDate = #{contractEndDate}</if>

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

@@ -115,8 +115,7 @@
         </where>
     </select>
 
-    <select id="getCmProvidersById" parameterType="String"
-            resultType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel">
+    <select id="getCmProvidersById" resultType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel">
         select serviceProviderId,
                name,
                serviceLevel,
@@ -128,6 +127,7 @@
                contractMobile as mobile,
                text,
                brandName,
+               insiderFlag,
                qrCodeImage,
                qualificationImage,
                qualificationId,
@@ -344,7 +344,7 @@
 
 
     <insert id="addCmProviders" parameterType="com.caimei365.manager.entity.caimei.providers.ServiceProviderModel"
-            useGeneratedKeys="true" keyProperty="id">
+            useGeneratedKeys="true" keyProperty="serviceProviderId">
         insert into serviceprovider
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="serviceProviderId != null and serviceProviderId != ''">id,</if>
@@ -428,7 +428,7 @@
             <if test="serviceCategory != null">serviceCategory = #{serviceCategory},</if>
             <if test="address != null and address != ''">address = #{address},</if>
             <if test="linkMan != null and linkMan != ''">linkMan = #{linkMan},</if>
-            <if test="mobile != null and mobile != ''">mobile = #{mobile},</if>
+            <if test="mobile != null and mobile != ''">contractMobile = #{mobile},</if>
             <if test="text != null and text != ''">text = #{text},</if>
             <if test="qrCodeImage != null and qrCodeImage != ''">qrCodeImage = #{qrCodeImage},</if>
             <if test="qualificationImage != null and qualificationImage != ''">qualificationImage =