feat: 商品反馈拓展附件；订单拓展中止接口；企业微信拓展应用

src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java

@@ -0,0 +1,48 @@
+package com.qs.serve.common.util;
+
+import cn.hutool.crypto.digest.DigestUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+/**
+ * @author YenHex
+ * @since 2024/1/26
+ */
+@Slf4j
+@Service
+public class TianYiYunSmsUtil {
+
+    private final static String url = "http://sms.189ek.com/yktsms/send?";
+
+    private final static String appId = "WIgWyCFn4DnHLtjKBIXBVyZbGevFg3J4";
+
+    private final static String appKey = "bjfsZlF01OZPUzyiCLSFOrOOnfsZhYZJ";
+
+    public static void sendMsg(String code){
+        send("13286630016,15989082884,15913696250",code);
+    }
+
+    public static void send(String phone,String code){
+        //需要发送的手机号(多个号码以英文逗号 “,”分隔) 一次性最多 100 个号码
+        String mobiles = phone;
+        String content = "【嘉士利】尊敬的用户，您预约来访已成功，"+code;
+        String sign = DigestUtil.md5Hex(appId+mobiles+content+appKey);
+        try {
+            String msg = URLEncoder.encode(content,"utf-8");
+            String params = "appid="+ appId +
+                    "&mobile="+ mobiles +
+                    "&msg=" +  msg +
+                    "&sign=" + sign +
+                    "&extPort=";
+            String result = HttpUtil.doPost(url+params,"{}",null);
+            log.debug("sms result = > {}",result);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+}

src/main/java/com/qs/serve/modules/goods/controller/GoodsFeedbackController.java

@@ -23,6 +23,7 @@ import com.qs.serve.modules.goods.service.GoodsFeedbackTypeService;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
 import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import lombok.AllArgsConstructor;
@@ -56,6 +57,7 @@ public class GoodsFeedbackController {
     private SysPostUserService postUserService;
     private GoodsSkuService goodsSkuService;
     private GoodsSpuService goodsSpuService;
+    private SysAttachService attachService;
 
     /**
      * 列表
@@ -183,6 +185,10 @@ public class GoodsFeedbackController {
             String string = goodsFeedbackTypes.stream().map(GoodsFeedbackType::getName).collect(Collectors.joining("/"));
             feedbackVo.setFeedBackTypes(goodsFeedbackTypes);
         }
+        if(feedbackVo.getAttachIds()!=null&&feedbackVo.getAttachIds().length>0){
+            List list2 = attachService.listByIds(Arrays.asList(feedbackVo.getAttachIds()));
+            feedbackVo.setAttachList(list2);
+        }
         return R.ok(feedbackVo);
     }
 
@@ -216,6 +222,19 @@ public class GoodsFeedbackController {
         return R.ok();
     }
 
+
+    /**
+     * 更新
+     * @param param
+     * @return
+     */
+    @PostMapping("/updateById")
+    @SysLog(module = SystemModule.GOODS, title = "问题反馈", biz = BizType.UPDATE)
+    public R<?> updateById(@RequestBody @Valid GoodsFeedback param){
+        boolean result = goodsFeedbackService.updateById(param);
+        return R.isTrue(result);
+    }
+
     /**
      * 删除（我的删除接口 30天内可删除）
      * @param ids

src/main/java/com/qs/serve/modules/goods/entity/GoodsFeedback.java

@@ -45,6 +45,10 @@ public class GoodsFeedback implements Serializable {
     @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
     private String[] imgUrls;
 
+    /** 附件id */
+    @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
+    private String[] attachIds;
+
     /** 反馈类型 */
     @Length(max = 255,message = "反馈类型长度不能超过255字")
     private String feedbackTypeId;

src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsFeedbackBo.java

@@ -23,7 +23,8 @@ public class GoodsFeedbackBo {
 
     /** 反馈图片 */
     private String[] imgUrls;
-
+    /** 附件id */
+    private String[] attachIds;
     /** 反馈类型 */
     private String feedbackTypeId;
 

src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsFeedbackVo.java

@@ -20,4 +20,5 @@ public class GoodsFeedbackVo extends GoodsFeedback {
 
     List<?> feedBackTypes;
 
+    List<?> attachList;
 }

src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java

@@ -62,7 +62,9 @@ public class HisUserSupplierTempServiceImpl extends ServiceImpl<HisUserSupplierT
         List<SysUser> sysUser = sysUserMapper.selectList(new QueryWrapper<>());
         List<String> userIds = sysUser.stream().map(a->a.getId()).collect(Collectors.toList());
         //初始化
-        for (String userId : userIds) {
+        for (int i = 0; i < userIds.size(); i++) {
+            String userId = userIds.get(i);
+            log.warn("正在同步客户："+i+"/"+userIds.size());
             this.initByUserId(userId,null);
         }
     }

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

@@ -23,6 +23,7 @@ import com.qs.serve.modules.oms.service.OmsOrderItemService;
 import com.qs.serve.modules.oms.service.OmsOrderOptionsService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,6 +34,7 @@ import com.qs.serve.modules.oms.service.OmsOrderService;
 
 import javax.validation.Valid;
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -56,6 +58,46 @@ public class OmsOrderController {
     private OmsOrderItemService omsOrderItemService;
     private BmsSupplierMapper bmsSupplierMapper;
 
+    /**
+     * ID查询
+     * @param orderCode
+     * @return
+     */
+    @GetMapping("/stopOrder/{orderCode}")
+    @SysLog(module = SystemModule.BASE, title = "订单", biz = BizType.QUERY)
+    public R<OmsOrder> stopOrder(@PathVariable("orderCode") String orderCode){
+        OmsOrder omsOrder = omsOrderService.getOne(new LambdaQueryWrapper<OmsOrder>()
+                .eq(OmsOrder::getOrderSn,orderCode),false);
+        if(omsOrder.getOrderType().equals(3)&&omsOrder.getOrderCheckState()
+                .equals(OmsOrderCheckState.Commiting.getCode())){
+            omsOrderOptionsService.doRefuse(new TbsAffairCommitBo(omsOrder.getId()+""));
+            return R.ok();
+        }
+        return R.error("更新行数为0");
+    }
+
+    /**
+     * ID查询
+     * @param orderCode
+     * @return
+     */
+    @GetMapping("/checkOrder/{orderCode}")
+    @SysLog(module = SystemModule.BASE, title = "订单", biz = BizType.QUERY)
+    public R<OmsOrder> checkOrder(@PathVariable("orderCode") String orderCode){
+        OmsOrder omsOrder = omsOrderService.getOne(new LambdaQueryWrapper<OmsOrder>()
+                .eq(OmsOrder::getOrderSn,orderCode),false);
+        if(omsOrder.getOrderType().equals(3)&&omsOrder.getOrderCheckState()
+                .equals(OmsOrderCheckState.Commiting.getCode())){
+            //omsOrderOptionsService.runCompensate(omsOrder.getId()+"");
+            omsOrderOptionsService.doFinished(new TbsAffairCommitBo(omsOrder.getId()+""));
+            omsOrderOptionsService.syncToErp();
+            return R.ok();
+        }
+        // 测试扣率
+        //omsOrderOptionsService.syncToErp11DB(Arrays.asList(omsOrder));
+        return R.error("更新行数为0");
+    }
+
     /**
      * 翻页
      * @param param

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

@@ -418,6 +418,31 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService {
 
     }
 
+    @Override
+    public Object doNext(TbsAffairCommitBo param) {
+        OmsOrder omsOrder = omsOrderService.getById(param.getTargetId());
+        R codeRs = seeYonRequestBaseService.getBase(
+                TbsSeeYonConst.OA_DATA_EXPIRE_ORDER_DR + omsOrder.getOrderSn()
+                ,"获取条款申请流水号");
+        BigDecimal dr = null;
+        if(codeRs.getStatus()==200 && codeRs.getMsg()!=null){
+            try {
+                String oaRateId = codeRs.getMsg().toString();
+                dr = omsOrderMapper.getExpiredOrderRates(oaRateId);
+                omsOrder.setDiscountRate(dr);
+                omsOrder.setOaRateId(oaRateId);
+                omsOrderMapper.updateById(omsOrder);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        if(dr==null){
+            log.error("临期品订单，获取最新的折扣率失败，单号：{}",omsOrder.getOrderSn());
+            return null;
+        }
+        return null;
+    }
+
     @Override
     public String getTemplateCode() {
         return TbsSeeYonConst.ExpiredOrderConf.Code();

src/main/java/com/qs/serve/modules/wx/common/conf/WxCpConfig.java

@@ -37,6 +37,8 @@ public class WxCpConfig {
         secretMap.put(1000015,"ylgxFjYWogNXAdVGRrWiCBN2lx6Ys7PgYMG8GkQatrY");
         //订单
         secretMap.put(1000016,"0lYdQJXaYrJ_1WUeXDHpHGcYnOQva6Ve6S-6gxQpfdY");
+        //行事历
+        secretMap.put(1000022,"fgCIlShP7NuGa4v_M3vy642aop-ZGnnabC3_YQiCS_M");
     }
 
     public static String getSecret(Integer agentId){