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

2.新增一个获取三方商场名字和id的方法
3.默认指派客服的bug修复

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCustomerMallMapper.xml

@@ -23,7 +23,7 @@
         SELECT *
         FROM `logpm_aftersales_customer_mall`
         WHERE client_id = #{clientId}
-          and is_deleted = 0
+          and is_deleted = 0 and types_of = 2
         order by create_time ASC
     </select>
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -744,7 +744,11 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 						}else if( ObjectUtils.isNotNull( workOrderStatus ) && WorkOrderStatusConstant.yiwanjei.getValue().equals(workOrderStatus) ){
 							aftersalesWorkOrder.remove("workOrderStatus");
 							aftersalesWorkOrder.put("customerServiceState","10");
-					}
+						}else if (ObjectUtils.isNotNull( workOrderStatus ) && WorkOrderStatusConstant.daichuli.getValue().equals(workOrderStatus)){
+							aftersalesWorkOrder.remove("workOrderStatus");
+							aftersalesWorkOrder.put("customerServiceState","30");
+							aftersalesWorkOrder.put("customerServiceId",user.getUserId());
+						}
 						break;
 				}
 			}else{

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTripartiteMallController.java

@@ -156,4 +156,10 @@ public class BasicdataTripartiteMallController extends BladeController {
 		ExcelUtil.export(response, "客户三方商城数据" + DateUtil.time(), "客户三方商城数据表", list, BasicdataTripartiteMallExcel.class);
 	}
 
+	@GetMapping("/getOwn")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "获取全部的数据", notes = "传入basicdataTripartiteMall")
+	public R<List<BasicdataTripartiteMallEntity>> getOwn() {
+	   return R.data(basicdataTripartiteMallService.getOwn());
+	}
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.java

@@ -53,4 +53,6 @@ public interface BasicdataTripartiteMallMapper extends BaseMapper<BasicdataTripa
 	List<BasicdataTripartiteMallExcel> exportBasicdataTripartiteMall(@Param("ew") Wrapper<BasicdataTripartiteMallEntity> queryWrapper);
 
     Long getClientIdByNameAndBrand(@Param("name") String name, @Param("brand") String brand);
+
+	List<BasicdataTripartiteMallEntity> getOwn();
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml

@@ -41,6 +41,9 @@
         and brand_name = #{brand}
         limit 1
     </select>
+    <select id="getOwn" resultType="com.logpm.basicdata.entity.BasicdataTripartiteMallEntity">
+        select tripartite_mall,id from logpm_basicdata_tripartite_mall where is_deleted = 0
+    </select>
 
 
 </mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTripartiteMallService.java

@@ -51,4 +51,6 @@ public interface IBasicdataTripartiteMallService extends BaseService<BasicdataTr
 	List<BasicdataTripartiteMallExcel> exportBasicdataTripartiteMall(Wrapper<BasicdataTripartiteMallEntity> queryWrapper);
 
     Long getClientIdByNameAndBrand(String name, String brand);
+
+	List<BasicdataTripartiteMallEntity> getOwn();
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java

@@ -57,4 +57,8 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 		return baseMapper.getClientIdByNameAndBrand(name,brand);
 	}
 
+	@Override
+	public List<BasicdataTripartiteMallEntity> getOwn() {
+		return baseMapper.getOwn();
+	}
 }