diff --git a/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderExpiredController.java b/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderExpiredController.java index bce4dfce..848e49d8 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderExpiredController.java +++ b/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.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @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(); + } } diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java index ec12595d..dee9728a 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java +++ b/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; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index e063bfbf..c04f64db 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -167,9 +167,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl小程序;2->公众号】 */ + /** 应用类型【1->小程序;2->公众号;3->企业公众号】 */ private Integer appType; /** 应用密钥 */ diff --git a/src/main/java/com/qs/serve/modules/wx/service/impl/WxUserServiceImpl.java b/src/main/java/com/qs/serve/modules/wx/service/impl/WxUserServiceImpl.java index 6bfd58f0..e1491989 100644 --- a/src/main/java/com/qs/serve/modules/wx/service/impl/WxUserServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/wx/service/impl/WxUserServiceImpl.java @@ -160,7 +160,6 @@ public class WxUserServiceImpl extends ServiceImpl 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 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);