opt: 添加tags到审批；feat：订单拓展复制功能

src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java

@@ -340,5 +340,15 @@ public class OmsOrderApi {
         return R.ok();
     }
 
+    /**
+     * 复制订单
+     * @param orderId
+     * @return
+     */
+    @PostMapping("/copyOrder/{orderId}")
+    public R<OmsOrder> copyOrder(@PathVariable Long orderId){
+        return R.ok(omsOrderService.copyOrder(orderId));
+    }
+
 }
 

src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java

@@ -78,5 +78,12 @@ public interface OmsOrderService extends IService<OmsOrder> {
      */
     OmsOrder modifyImminentOrder(OmsOrderImminentBo param);
 
+    /**
+     * 复制订单
+     * @param orderId
+     * @return
+     */
+    OmsOrder copyOrder(Long orderId);
+
 }
 

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -784,6 +784,57 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         return order;
     }
 
+    @Override
+    public OmsOrder copyOrder(Long orderId) {
+        OmsOrder orgOrder = this.getById(orderId);
+        List<OmsOrderItem> orderItems = omsOrderItemService.list(new LambdaQueryWrapper<OmsOrderItem>()
+                .eq(OmsOrderItem::getOrderId,orderId));
+        OmsOrder order = new OmsOrder();
+        order.setId(null);
+        order.setOrderType(orgOrder.getOrderType());
+        String orderPrefix = null;
+        if(order.getOrderType().equals(0)){
+            orderPrefix = "SN";
+        }else if(order.getOrderType().equals(1)){
+            orderPrefix = "ZP";
+        }else if(order.getOrderType().equals(2)){
+            orderPrefix = "SC";
+        }else if(order.getOrderType().equals(3)){
+            orderPrefix = "SP";
+        }else {
+            Assert.throwEx("订单类型错误");
+        }
+        order.setOrderSn(orderPrefix+CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder));
+        SysUser user = sysUserService.getById(AuthContextUtils.getSysUserId());
+        order.setUserId(user.getId());
+        order.setUserCode(user.getCode());
+        order.setUserName(user.getName());
+        order.setUserPhone(user.getMobile());
+        order.setCheckState(0);
+
+        order.setLatitudeFrom(orgOrder.getLatitudeFrom());
+        order.setOrderSource(orgOrder.getOrderSource());
+        order.setSupplierId(orgOrder.getSupplierId());
+        order.setSupplierCode(orgOrder.getSupplierCode());
+        order.setSupplierName(orgOrder.getSupplierName());
+        order.setSupplierAddrId(orgOrder.getSupplierAddrId());
+        order.setBrandRuleId(orgOrder.getBrandRuleId());
+        order.setBrandRuleName(orgOrder.getBrandRuleName());
+
+        order.setBillType(orgOrder.getBillType());
+        order.setCdOrderRemark(orgOrder.getCdOrderRemark());
+        order.setRemark(orgOrder.getRemark());
+
+
+        this.save(order);
+        for (OmsOrderItem item : orderItems) {
+            item.setId(null);
+            item.setOrderId(order.getId());
+        }
+        omsOrderItemService.saveBatch(orderItems);
+        return order;
+    }
+
     @NotNull
     private OmsOrderItem createImminentOrderItem(OmsOrder order, List<GoodsSpu> spuList, OmsOrderImminentBo.ItemParam item, GoodsImminentBatch batch, GoodsSku sku) {
         OmsOrderItem orderItem = new OmsOrderItem();

src/main/java/com/qs/serve/modules/tag/mapper/TagInfoMapper.java

@@ -1,7 +1,12 @@
 package com.qs.serve.modules.tag.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.serve.modules.tag.entity.TagInfo;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 标签信息 Mapper
@@ -10,5 +15,18 @@ import com.qs.serve.modules.tag.entity.TagInfo;
  */
 public interface TagInfoMapper extends BaseMapper<TagInfo> {
 
+    @InterceptorIgnore(tenantLine = "1")
+    @Select(" SELECT  " +
+            "  DISTINCT " +
+            "  tag_info.tag_name  " +
+            " FROM `tag_data`  " +
+            "  left join tag_info on tag_id = tag_info.id " +
+            " where  " +
+            "  tag_data.del_flag = 0  " +
+            "  and tag_info.del_flag = 0 " +
+            "  and target_type = 'customer' " +
+            "  and target_code = #{supplierCode} ")
+    List<String> lisTagsBySupplierCode(@Param("supplierCode") String supplierCode);
+
 }
 

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

@@ -47,6 +47,7 @@ import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.sys.service.SysConfigService;
 import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tag.mapper.TagInfoMapper;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
@@ -131,6 +132,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     private TbsCostCheckStateMapper costCheckStateMapper;
     private TbsCostApplyMapper tbsCostApplyMapper;
     private ProjectApisProperties projectApisProperties;
+    private TagInfoMapper tagInfoMapper;
 
     @Override
     public BigDecimal totalCostUsed(Long id) {
@@ -954,7 +956,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         }
         data.put("remark", tbsCostApply.getRemark());
 
-
+        //添加客户标签
+        List<String> tags = tagInfoMapper.lisTagsBySupplierCode(supplier.getCode());
+        data.put("tags",tags);
 
         if(contracts.size()>0){
             //构建合同DATA
@@ -1309,6 +1313,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         }
         String goods = bands.stream().collect(Collectors.joining(","));
         data.put("chanPinPinLei",goods);
+        //添加客户标签
+        List<String> tags = tagInfoMapper.lisTagsBySupplierCode(supplier.getCode());
+        data.put("tags",tags);
         data.put("sub",subList);
     }
 

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

@@ -33,6 +33,7 @@ import com.qs.serve.modules.sys.entity.SysSyncLog;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysSyncLogService;
 import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tag.mapper.TagInfoMapper;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
@@ -119,6 +120,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
 
     private final SysUserService sysUserService;
 
+    private TagInfoMapper tagInfoMapper;
     private final PayWayMapper payWayMapper;
     private final ProjectProperties projectProperties;
 
@@ -1145,6 +1147,10 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         data.put("exsp5",urlKey);
         data.put("cmsLink",baseJumpUrl);
 
+        //添加客户标签
+        List<String> tags = tagInfoMapper.lisTagsBySupplierCode(activity.getSupplierCode());
+        data.put("tags",tags);
+
         List<TbsActivitySubject> subjectList = activitySubjectService.listByActivityId(activity.getId());
         List<VtbSubjectDTO> subjectDTOList = new ArrayList<>();
         for (TbsActivitySubject activitySubject : subjectList) {