微调

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

@@ -8,10 +8,7 @@ import com.qs.serve.modules.oms.entity.OmsOrder;
 import com.qs.serve.modules.oms.service.OmsOrderOptionsService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author YenHex
@@ -37,6 +34,16 @@ public class OmsOrderExpiredController {
         return R.ok();
     }
 
+    @GetMapping("compensate/{id}")
+    public R<?> runCompensate(@PathVariable String id){
+        omsOrderOptionsService.runCompensate(id);
+        return R.ok();
+    }
 
+    @GetMapping("sync")
+    public R<?> sync(){
+        omsOrderOptionsService.syncToErp();
+        return R.ok();
+    }
 
 }

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

@@ -32,6 +32,7 @@ import com.qs.serve.modules.oms.service.OmsOrderItemService;
 import com.qs.serve.modules.oms.service.OmsOrderOptionsService;
 import com.qs.serve.modules.oms.service.OmsOrderService;
 import com.qs.serve.modules.oms.utils.OmsOrderUtil;
+import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
@@ -216,6 +217,9 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService {
         omsOrder.setOrderCheckState(OmsOrderCheckState.Commiting.getCode());
         omsOrder.setOrderCheckSubmitTime(LocalDateTime.now());
         omsOrderService.updateById(omsOrder);
+
+        BaseCreateCallbackBo callbackBo = new BaseCreateCallbackBo(templateCode,orderId);
+        seeYonService.createCallbackStatus(callbackBo);
         return R.ok();
     }
 
@@ -348,7 +352,7 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService {
     @Override
     public Object doRefuse(TbsAffairCommitBo param) {
         OmsOrder omsOrder = omsOrderService.getById(param.getTargetId());
-        omsOrder.setOrderCheckState(OmsOrderCheckState.Finished.getCode());
+        omsOrder.setOrderCheckState(OmsOrderCheckState.Stop.getCode());
         omsOrderService.updateById(omsOrder);
         return null;
     }

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

@@ -167,9 +167,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     @Transactional(rollbackFor = Exception.class)
     public void removeCostById(Long id) {
         TbsCostApply costApply = this.getById(id);
-        if(!costApply.getChargeState().equals(TbsCostApplyState.State_2_actioning.getCode())
+        if(!costApply.getChargeState().equals(TbsCostApplyState.State_2_actioning.getCode())){
-                &&!costApply.getChargeState().equals(TbsCostApplyState.State_4_refused.getCode())){
+            Assert.throwEx("费用待执行状态才可作废");
-            Assert.throwEx("当前单据状态不可作废");
         }
         if(costApply.getContractFlag().equals(1)){
             Assert.throwEx("协议类不支持作废");

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

@@ -21,15 +21,20 @@ import org.springframework.context.annotation.Configuration;
 @Configuration(proxyBeanMethods = false)
 public class WxCpConfig {
     private static WxCpService wxCpService;
-    private static Integer agentId = 10000;
+    //本公司KEY
-    private static String secret = "应用密钥";
+    private static Integer agentId = 1000008;
-    private static String corpId = "企业微信id";
+    private static String secret = "tC2ENr_hs0on-OMfWMQ6ch3TL2ndcUDz1b34K-M7VGg";
+    private static String corpId = "ww0e85370756611dc2";
+
+//    //嘉士利KEY
+//    private static Integer agentId = 100000;
+//    private static String secret = "Q6ch3TL2ndcUDz1b34K-M7VGg";
+//    private static String corpId = "ww0e85370756111111";
 
     public WxCpService wxCpService(){
         if(wxCpService!=null){
             return wxCpService;
         }
-        //
         WxCpService service = new WxCpServiceImpl();
         WxCpDefaultConfigImpl config =new WxCpDefaultConfigImpl();
         config.setAgentId(agentId);
@@ -40,10 +45,4 @@ public class WxCpConfig {
         return service;
     }
 
-   public void testLogin(String code)throws Exception{
-
-
-
-   }
-
 }

src/main/java/com/qs/serve/modules/wx/entity/WxApp.java

@@ -34,7 +34,7 @@ public class WxApp implements Serializable {
     @NotNull(message = "微信原始标识不能为空")
     private String weixinSign;
 
-    /** 应用类型【1->小程序；2->公众号】 */
+    /** 应用类型【1->小程序；2->公众号;3->企业公众号】 */
     private Integer appType;
 
     /** 应用密钥 */

src/main/java/com/qs/serve/modules/wx/service/impl/WxUserServiceImpl.java

@@ -160,7 +160,6 @@ public class WxUserServiceImpl extends ServiceImpl<WxUserMapper, WxUser> impleme
         return this.list(lqw);
     }
 
-
     @Override
     public WxUser login(WxLoginUser wxLoginUser, HttpServletRequest request){
         String code = wxLoginUser.getCode();
@@ -195,15 +194,16 @@ public class WxUserServiceImpl extends ServiceImpl<WxUserMapper, WxUser> impleme
                             .eq(SysUser::getMobile,wxCpUser.getMobile()));
                     if(sysUsers.size()>0){
                         if(sysUsers.size()>1){
-                            log.error("一个号码被多人使用：{}",wxCpUser.getMobile());
+                            log.error("企业微信登录，一个号码被多人使用：{}",wxCpUser.getMobile());
                         }
                         SysUser sysUser = sysUsers.get(0);
                         wxUser.setSysUserId(sysUser.getId());
                         wxUser.setSysUserCode(sysUser.getCode());
                         wxUser.setEmpName(sysUser.getName());
                         wxUser.setPhone(sysUser.getMobile());
+                    }else {
+                        Assert.throwEx("CMS未收录该手机号["+wxCpUser.getMobile()+"]");
                     }
-
                 }
                 if(wxUser.getId()==null){
                     save(wxUser);