Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/CommonBusinessService.java

@@ -197,8 +197,6 @@ public class CommonBusinessService {
 
             CooperateManageQueryResVo cooperateManageQueryResVo = new CooperateManageQueryResVo();
             cooperateManageQueryResVo.setId(cooperateManageQueryResDto.getId());
-            cooperateManageQueryResVo.setCooperateTypes(cooperateManageQueryResDto.getTypes());
-
             cooperateManageQueryResVo.setRemark(cooperateManageQueryResDto.getRemark());
             cooperateManageQueryResVo.setStatus(cooperateManageQueryResDto.getStatus());
             cooperateManageQueryResVo.setApplyTypeCode(cooperateManageQueryResDto.getApplyTypeCode());
@@ -218,6 +216,7 @@ public class CommonBusinessService {
                 cooperateManageQueryResVo.setManager(cooperateManageQueryResDto.getInviterContacts());
                 cooperateManageQueryResVo.setManagerPhone(cooperateManageQueryResDto.getInviterPhone());
                 cooperateManageQueryResVo.setManagerId(cooperateManageQueryResDto.getInviterContactsId());
+                cooperateManageQueryResVo.setCooperateTypes(cooperateManageQueryResDto.getTypes());
             } else {
                 cooperateManageQueryResVo.setContacts(cooperateManageQueryResDto.getInviterContacts());
                 cooperateManageQueryResVo.setPhone(cooperateManageQueryResDto.getInviterPhone());
@@ -225,6 +224,7 @@ public class CommonBusinessService {
                 cooperateManageQueryResVo.setManager(cooperateManageQueryResDto.getInviteeContacts());
                 cooperateManageQueryResVo.setManagerPhone(cooperateManageQueryResDto.getInviteePhone());
                 cooperateManageQueryResVo.setManagerId(cooperateManageQueryResDto.getInviteeContactsId());
+                cooperateManageQueryResVo.setCooperateTypes(changeCooperateType(cooperateManageQueryResDto.getTypes()));
             }
 
             //转换合作属性
@@ -263,6 +263,28 @@ public class CommonBusinessService {
         return null;
     }
 
+    public String changeCooperateType(String types) {
+        String str = "";
+
+        if (types.contains(String.valueOf(CooperateTypeEnum.SUPPLIER.getCode()))) {
+            str += CooperateTypeEnum.PURCHASER.getCode() + Global.COMMA;
+        }
+
+        if (types.contains(String.valueOf(CooperateTypeEnum.PURCHASER.getCode()))) {
+            str += CooperateTypeEnum.SUPPLIER.getCode() + Global.COMMA;
+        }
+
+        if (types.contains(String.valueOf(CooperateTypeEnum.CONSIGN.getCode()))) {
+            str += CooperateTypeEnum.CARRIAGE.getCode() + Global.COMMA;
+        }
+
+        if (types.contains(String.valueOf(CooperateTypeEnum.CARRIAGE.getCode()))) {
+            str += CooperateTypeEnum.CONSIGN.getCode() + Global.COMMA;
+        }
+
+        return str.substring(0, str.length() - 1);
+    }
+
     /**
      * @return FindListGroupResVo
      * @desc: 初始化分组返参

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateApplyService.java

@@ -121,7 +121,6 @@ public class KwmCooperateApplyService {
 
             CooperateManageQueryResVo cooperateManageQueryResVo = new CooperateManageQueryResVo();
             cooperateManageQueryResVo.setId(cooperateManageQueryResDto.getId());
-            cooperateManageQueryResVo.setCooperateTypes(cooperateManageQueryResDto.getTypes());
             cooperateManageQueryResVo.setCreateTime(cooperateManageQueryResDto.getCreateTime());
             cooperateManageQueryResVo.setRemark(cooperateManageQueryResDto.getRemark());
             cooperateManageQueryResVo.setStatus(cooperateManageQueryResDto.getStatus());
@@ -141,6 +140,8 @@ public class KwmCooperateApplyService {
                 cooperateManageQueryResVo.setManager(cooperateManageQueryResDto.getInviterContacts());
                 cooperateManageQueryResVo.setManagerPhone(cooperateManageQueryResDto.getInviterPhone());
                 cooperateManageQueryResVo.setManagerId(cooperateManageQueryResDto.getInviterContactsId());
+                cooperateManageQueryResVo.setCooperateTypes(cooperateManageQueryResDto.getTypes());
+
             } else {
                 cooperateManageQueryResVo.setContacts(cooperateManageQueryResDto.getInviterContacts());
                 cooperateManageQueryResVo.setPhone(cooperateManageQueryResDto.getInviterPhone());
@@ -148,6 +149,8 @@ public class KwmCooperateApplyService {
                 cooperateManageQueryResVo.setManager(cooperateManageQueryResDto.getInviteeContacts());
                 cooperateManageQueryResVo.setManagerPhone(cooperateManageQueryResDto.getInviteePhone());
                 cooperateManageQueryResVo.setManagerId(cooperateManageQueryResDto.getInviteeContactsId());
+                cooperateManageQueryResVo.setCooperateTypes(commonBusinessService.changeCooperateType(cooperateManageQueryResDto.getTypes()));
+
             }
 
             result.add(cooperateManageQueryResVo);

sckw-modules/sckw-operation/pom.xml

@@ -89,7 +89,7 @@
                             <artifactId>lombok</artifactId>
                         </exclude>
                     </excludes>
-                    <mainClass>com.sckw.operation.OperationApplication</mainClass>
+                    <mainClass>com.sckw.operation.OPerationApplication</mainClass>
                 </configuration>
             </plugin>
         </plugins>

sckw-modules/sckw-order/src/main/resources/mapper/KwoWantBuyMapper.xml

@@ -36,7 +36,7 @@
         <result column="remark" property="remark"/>
         <result column="createTime" property="createTime"/>
         <result column="updateTime" property="updateTime"/>
-        <collection property="wantBuyTradings" column="id" ofType="com.sckw.order.model.vo.res.WantBuyTradingRes"  javaType="java.util.List" >
+        <collection property="wantBuyTradings" column="id" ofType="com.sckw.order.model.vo.res.WantBuyTradingRes"  javaType="java.util.List" select="tradingSql">
             <id column="wantBuyId" property="wantBuyId"/>
             <result column="trading" property="trading"/>
         </collection>