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

# Conflicts: # fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/follow/ClueTask.java # fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowPoolDTO.java # fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/pool/FollowPoolListVO.java

Merge remote-tracking branch 'origin/dev' into test
# Conflicts: # fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/follow/ClueTask.java # fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowPoolDTO.java # fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/pool/FollowPoolListVO.java
张志伟
2 parents 9489fc88 361bbddb
Showing 6 changed files with 28 additions and 12 deletions
fw-valhalla-dao/src/main/resources/mapper/ClueTaskMapper.xml
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubFollowBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/CustomerServiceImpl.java
@@ -30,6 +30,7 @@
         t1.reason initiative,
         t1.version version,
         t1.group_id group_id
+        t1.`version` `version`
         FROM clue_task t1
         left join follow_clue t6 on t1.clue_id=t6.id
         left join customer t3 on t6.vin = t3.frame_no and t6.group_id = t3.group_id and t3.yn=1
@@ -163,14 +164,14 @@
             </if>
             <if test="condition.closeTime1 !=null or condition.closeTime2 !=null">
                 and ( t1.close_time is null or (
-                    <trim prefixOverrides="and">
-                        <if test="condition.closeTime1 !=null">
-                            and t1.close_time >= #{condition.closeTime1}
-                        </if>
-                        <if test="condition.closeTime2 !=null">
-                            and t1.close_time &lt;= #{condition.closeTime2}
-                        </if>
-                    </trim>
+                <trim prefixOverrides="and">
+                    <if test="condition.closeTime1 !=null">
+                        and t1.close_time >= #{condition.closeTime1}
+                    </if>
+                    <if test="condition.closeTime2 !=null">
+                        and t1.close_time &lt;= #{condition.closeTime2}
+                    </if>
+                </trim>
                 ))
             </if>
             <if test="condition.initiative !=null">
@@ -580,6 +580,7 @@ public class CustomerBizService extends AbstractCustomerService {
         boolean updated = customerService.update(Wrappers.<Customer>lambdaUpdate()
                 .set(Customer::getAdviserId, null)
                 .set(Customer::getShopId, null)
+                .set(Customer::getTemporary, null)
                 .eq(Customer::getId, detailDto.getId()));
         if (!updated) {
             return;
@@ -618,6 +619,7 @@ public class CustomerBizService extends AbstractCustomerService {
         boolean updated = customerService.update(Wrappers.<Customer>lambdaUpdate()
                 .set(Customer::getAdviserId, null)
                 .set(Customer::getShopId, null)
+                .set(Customer::getTemporary, null)
                 .eq(Customer::getId, detailDto.getId()));
         if (!updated) {
             return;
@@ -840,6 +842,7 @@ public class CustomerBizService extends AbstractCustomerService {
         customer.setCreateTime(new Date());
         customer.setUpdateTime(new Date());
         customer.setYn(Boolean.TRUE);
+        customer.setTemporary(Boolean.FALSE);
         final SpecDTO spec = oopService.spec(customerParams.getSpecId());
         customer.setCarImage(Optional.ofNullable(spec).orElse(new SpecDTO()).getThumbnail());
         customer.setShopId(casShopId);
@@ -1040,6 +1043,7 @@ public class CustomerBizService extends AbstractCustomerService {
         customerService.update(Wrappers.<Customer>lambdaUpdate()
                 .set(Customer::getAdviserId, null)
                 .set(Customer::getShopId, null)
+                .set(Customer::getTemporary, null)
                 .in(Customer::getId, customerIdList));
     }
  
@@ -1054,6 +1058,7 @@ public class CustomerBizService extends AbstractCustomerService {
         customerService.update(Wrappers.<Customer>lambdaUpdate()
                 .set(Customer::getAdviserId, null)
                 .set(Customer::getShopId, null)
+                .set(Customer::getTemporary, null)
                 .eq(Customer::getId, customerId));
     }
  
@@ -351,6 +351,8 @@ public class CustomerChangeBizService extends AbstractCustomerService {
                         publicCluePoolService.removeClue(customer.getId(), adviserId);
                     }
                 }
+                customer.setTemporary(Boolean.FALSE);
+                customerService.updateById(customer);
                 stammkundePoolService.updateById(stammkundePool);
             }
             return true;
@@ -360,6 +362,7 @@ public class CustomerChangeBizService extends AbstractCustomerService {
         boolean updated = customerService.update(Wrappers.<Customer>lambdaUpdate()
                 .set(Customer::getAdviserId, adviserId)
                 .set(Customer::getShopId, shopId)
+                .set(Customer::getTemporary, Boolean.FALSE)
                 .eq(Customer::getId, changeAdviserReq.getCusId()));
  
         BV.isTrue(updated, () -> "变更档案服务顾问失败，请重试");
@@ -497,7 +500,7 @@ public class CustomerChangeBizService extends AbstractCustomerService {
             stammkundePoolService.save(simpleInfo);
             commonService.createClue(customer);
         }
-
+        customer.setTemporary(Boolean.FALSE);
         final CustomerInfoDto customerInfoDto = new CustomerInfoDto();
         BeanUtils.copyProperties(customer, customerInfoDto);
         customerInfoDto.setConsultantId(customer.getAdviserId());
@@ -738,6 +738,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         }
         redistributionTask.setGroupId(clue.getGroupId());
         redistributionTask.setRpcSuccess(Boolean.FALSE);
+        redistributionTask.setVersion(2);
         clueTaskService.save(redistributionTask);
         FollowInitDTO followInitDTO = creteRedistributionFollowInitDTO(clue, redistributionTask);
         shirasawaRpcService.changeFollowData(followInitDTO, redistributionTask.getBeginTime().toLocalDate());
@@ -242,9 +242,14 @@ public class PubFollowBizService {
         PublicPool publicPool = createPublicPool(customer);
         publicPoolService.save(publicPool);
         stammkundePoolService.reject(customer.getId(), customer.getGroupId(), DefeatReasonEnum.RC);
-        customer.setAdviserId(null);
-        customer.setShopId(null);
-        customerService.updateById(customer);
+
+        customerService.update(Wrappers.<Customer>lambdaUpdate()
+                .set(Customer::getTemporary, null)
+                .set(Customer::getShopId, null)
+                .set(Customer::getAdviserId, null)
+                .eq(Customer::getId, customer.getId())
+        );
+
     }
  
     private PublicPool createPublicPool(Customer customer) {
@@ -144,6 +144,7 @@ public class CustomerServiceImpl extends ServiceImpl&lt;CustomerMapper, Customer&gt; i
         update(Wrappers.<Customer>lambdaUpdate()
                 .set(Customer::getAdviserId, userId)
                 .set(Customer::getShopId, shopId)
+                .set(Customer::getTemporary, Boolean.TRUE)
                 .eq(Customer::getYn, Boolean.TRUE)
                 .eq(Customer::getGroupId, groupId)
                 .in(Customer::getFrameNo, vinList)