diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java index 337a8166..8b6049c7 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java @@ -102,11 +102,15 @@ public class OmsSaleOrder implements Serializable { private String checkUserId; /** 审核时间 */ - @Length(max = 0,message = "审核时间长度不能超过0字") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime checkTime; + /** 业务提交时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime busUserCheckTime; + /** 品牌ID */ @NotNull(message = "品牌ID不能为空") private Long brandRuleId; diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java index 69508f4e..a4ea1423 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java @@ -1444,6 +1444,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl { * @param skipPayFlag 跳过审批 */ void deleteCostApply(Long costApplyId,String remark); - void deleteCostApply(Long costApplyId,String remark,boolean skipPayFlag); + void deleteCostApply(Long costApplyId,String remark,boolean skipPayFlag,String userCode); } diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java index f20c9d2d..64774865 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java @@ -51,9 +51,12 @@ public class SysDeleteLogServiceImpl extends ServiceImpl0){ TbsCostApply costApply = costApplys.get(0); Long costApplyId = costApply.getId(); - deleteLogService.deleteCostApply(costApplyId,remark,skipPayFlag!=null&&skipPayFlag.equals(1)); + deleteLogService.deleteCostApply(costApplyId,remark,skipPayFlag!=null&&skipPayFlag.equals(1),null); BirActivityCenterGoodsUtil.buildBir(costApplyId); } return R.ok(); @@ -610,10 +610,10 @@ public class TbsCostApplyController { * @return */ @GetMapping("removeByAdmin2") - public R removeByAdmin2(String costCode,String remark){ + public R removeByAdmin2(String costCode,String remark,Integer skipPayFlag){ TbsCostApply costApply = tbsCostApplyMapper.selectList(new LambdaQueryWrapper().eq(TbsCostApply::getCode,costCode)).get(0); Long costApplyId = costApply.getId(); - deleteLogService.deleteCostApply(costApplyId,remark); + deleteLogService.deleteCostApply(costApplyId,remark,skipPayFlag!=null&&skipPayFlag.equals(1),null); BirActivityCenterGoodsUtil.buildBir(costApplyId); return R.ok(); } @@ -625,9 +625,9 @@ public class TbsCostApplyController { * @return */ @GetMapping("removeByAdmin") - public R removeByAdmin(Long costApplyId,String remark){ + public R removeByAdmin(Long costApplyId,String remark,Integer skipPayFlag){ BirActivityCenterGoodsUtil.buildBir(costApplyId); - deleteLogService.deleteCostApply(costApplyId,remark); + deleteLogService.deleteCostApply(costApplyId,remark,skipPayFlag!=null&&skipPayFlag.equals(1),null); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java index bcdd993b..acf78389 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java +++ b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.Assert; +import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.JsonUtil; import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil; @@ -81,7 +82,7 @@ public class PortalOfCostController { if(costApplys.size()>0){ TbsCostApply costApply = costApplys.get(0); Long costApplyId = costApply.getId(); - deleteLogService.deleteCostApply(costApplyId,param.getRemark(),skipPayFlag); + deleteLogService.deleteCostApply(costApplyId,param.getRemark(),skipPayFlag,param.getUserCode()); try { BirActivityCenterGoodsUtil.buildBir(costApplyId); } catch (Exception e) { diff --git a/src/main/java/com/qs/serve/modules/third/entity/param/DHXDelCostParam.java b/src/main/java/com/qs/serve/modules/third/entity/param/DHXDelCostParam.java index f1e37f83..e2d6432b 100644 --- a/src/main/java/com/qs/serve/modules/third/entity/param/DHXDelCostParam.java +++ b/src/main/java/com/qs/serve/modules/third/entity/param/DHXDelCostParam.java @@ -9,6 +9,7 @@ import lombok.Data; @Data public class DHXDelCostParam { + String userCode; String code; String remark; diff --git a/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java b/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java index dae20fde..26855a45 100644 --- a/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java +++ b/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java @@ -440,8 +440,8 @@ public class PortalOfCost2Application { Set centerTypes = centerDtoMap.keySet(); Iterator itr = centerTypes.iterator(); while (itr.hasNext()){ - String centerType = itr.next(); - TbsCenterDto center = centerDtoMap.get(centerType); + String centerCodeType = itr.next(); + TbsCenterDto center = centerDtoMap.get(centerCodeType); BigDecimal rateAmt = null; if(itr.hasNext()){ rateAmt = center.getCenterRate() @@ -457,7 +457,7 @@ public class PortalOfCost2Application { activityCenter.setSubjectId(subject.getId()); activityCenter.setCenterAmount(rateAmt); activityCenter.setCenterRate(OneHundred); - activityCenter.setCenterType(centerType); + activityCenter.setCenterType(center.getCenterType()); activityCenter.setCenterId(center.getId()); activityCenter.setCenterName(center.getCenterName()); activityCenter.setCenterCode(center.getCenterCode()); diff --git a/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java b/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java index f09ca89e..38d657b8 100644 --- a/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java +++ b/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java @@ -92,7 +92,9 @@ public class WxSvcUserApi { .eq(WxUser::getSysUserId,wxUser.getSysUserId()) .eq(WxUser::getAppType,2),false); if(wxUser1==null){ - Assert.throwEx("请前往CMS公众号绑定信息"); + wxUser.setSysUserInfo(sysUserVo); + return R.ok(wxUser); + //Assert.throwEx("请前往CMS公众号绑定信息"); } wxUser1.setSysUserInfo(sysUserVo); return R.ok(wxUser1);