政策同步到伟成接口

src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java

@@ -46,6 +46,7 @@ public class OmsOrderController {
     private OmsOrderService omsOrderService;
     private BmsSupplierAddressService bmsSupplierAddressService;
     private SysUserService sysUserService;
+    private OmsOrderItemService omsOrderItemService;
 
     /**
      * 翻页
@@ -71,6 +72,12 @@ public class OmsOrderController {
             if(sysUser!=null){
                 order.setCheckUserInfo(sysUser.toSysUserVo());
             }
+
+            LambdaQueryWrapper<OmsOrderItem> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(OmsOrderItem::getOrderId,order.getId());
+            List<OmsOrderItem> items = omsOrderItemService.list(lqw);
+            order.setOrderItems(items);
+
         }
         return R.byPageHelperList(list);
     }

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -357,6 +357,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         //恢复绑定
         this.releaseCost(tbsCostApply.getId(),0);
         Map<String, Object> data = new HashMap<>(10);
+        List<Long> oaAttachmentsIdList = null;
         if(tbsCostApply.getContractFlag()!=null&&tbsCostApply.getContractFlag().equals(1)){
             //创建协议的费用申请Data
             this.buildContractApplyData(id, tbsCostApply, activityList, payConditions, supplier, sysUser, data);
@@ -373,6 +374,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         createProcess.setMemberLoginName(sysUser.getSyAccount());
         createProcess.setSubjectTitle(TbsSeeYonConst.PRE_TITLE_COST_APPLY + tbsCostApply.getChargeTheme());
         createProcess.setTargetId(tbsCostApply.getId()+"");
+        createProcess.setAttachments(oaAttachmentsIdList);
         createProcess.setDataJson(JsonUtil.objectToJson(data));
         R<String> flowIdResult = seeYonService.baseCreateProcess(createProcess);
         if(flowIdResult.getStatus()!=200){

src/main/java/com/qs/serve/modules/tzc/entity/dto/PolicyItemDto.java

@@ -1,7 +1,10 @@
 package com.qs.serve.modules.tzc.entity.dto;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -17,13 +20,13 @@ public class PolicyItemDto {
     /** 主题 */
     private String title;
 
-    String policyItemCode;
+    private String policyItemCode;
 
-    String cusCode;
+    private String cusCode;
 
-    Date startDate;
+    private Date startDate;
 
-    Date endDate;
+    private Date endDate;
 
     /** 满减金额 */
     private BigDecimal discountAmount;
@@ -34,6 +37,27 @@ public class PolicyItemDto {
     /** 优惠上限 */
     private BigDecimal discountMax;
 
-    Set<String> invCodeList;
+    /** 旧参数 */
+    private Set<String> invCodeList;
+
+    /** 新参数 */
+    private List<PolicyGoodsItem> policyGoodsItemList;
+
+    @Data
+    public static class PolicyGoodsItem{
+
+        /** 目标类型(brand、category、series、spu、sku) */
+        private String targetType;
+
+        /** 目标id */
+        private Long targetId;
+
+        /** 目标编码 */
+        private String targetCode;
+
+        /** 目标名称 */
+        private String targetName;
+
+    }
 
 }

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -160,13 +160,33 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
             log.warn("[{}]政策同步失败，存货编码为空",policyItem.getPolicyItemCode());
             return;
         }
+        List<PolicyItemDto.PolicyGoodsItem> goodsItems = new ArrayList<>();
+        Map<String,String> tranCodeMap = new HashMap<>();
+        tranCodeMap.put("sku","invCode");
+        tranCodeMap.put("spu","invSkuCode");
+        tranCodeMap.put("brand","invBrandCode");
+        tranCodeMap.put("category","invCategoryCode");
+        tranCodeMap.put("series","invSeriesCode");
+        for (TzcPolicyGoods policyGood : policyGoods) {
+            PolicyItemDto.PolicyGoodsItem goodsItem = new PolicyItemDto.PolicyGoodsItem();
+            String tmp = tranCodeMap.get(policyGood.getTargetType());
+            goodsItem.setTargetType(tmp!=null?tmp:policyGood.getTargetType());
+            goodsItem.setTargetId(policyGood.getTargetId());
+            goodsItem.setTargetCode(policyGood.getTargetCode());
+            goodsItem.setTargetName(policyGood.getTargetName());
+            goodsItems.add(goodsItem);
+        }
+
         policyItemDto.setInvCodeList(invCodes);
+        policyItemDto.setPolicyGoodsItemList(goodsItems);
         //保存异步处理的
         xiaoLuTonService.savePolicyItem(policyItemDto);
         TzcPolicyItem updParam = new TzcPolicyItem();
         updParam.setId(policyItemId);
         updParam.setPolicyItemStatus(TzPolicyItemStatus.Status_2_SyncSuccess);
         tzcPolicyItemService.updateById(updParam);
+
+
     }
 
     /**
@@ -226,6 +246,7 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
         createProcess.setSubjectTitle(TbsSeeYonConst.PRE_TITLE_COST_APPLY + tzcPolicy.getTitle());
         createProcess.setTargetId(tzcPolicy.getId()+"");
         createProcess.setDataJson(JsonUtil.objectToJson(data));
+
         R<String> flowIdResult = seeYonService.baseCreateProcess(createProcess);
         if(flowIdResult.getStatus()!=200){
             Assert.throwEx(flowIdResult.getMsg());

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -1075,7 +1075,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     private BigDecimal validActivity(boolean cotractFlag,TbsActivity activity,boolean filterActTime,boolean isCurrentCommit){
         LocalDate nowDate = LocalDate.now();
         boolean isOverTime =
-                (nowDate.isAfter(activity.getPreCheckDate())&&activity.getPreEndDateBack()==null)
+                (activity.getPreCheckDate()!=null&&nowDate.isAfter(activity.getPreCheckDate())&&activity.getPreEndDateBack()==null)
                 ||(activity.getPreEndDateBack()!=null&&nowDate.isAfter(activity.getPreEndDateBack()));
         if(!cotractFlag && activity.getReopenFlag().equals(0)
                 && filterActTime