From 1b62ea02d7ed62ce9d28aa47a6bca487bdbc3cf4 Mon Sep 17 00:00:00 2001 From: chenwei Date: Fri, 6 Sep 2024 18:10:29 +0800 Subject: [PATCH] 统一订单状态 --- backend/README.md | 15 +++++++++++++++ backend/bpm-runtime/src/main/java/com/hotent/runtime/model/enums/UserParamsEnums.java | 12 ------------ backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java | 7 +++---- backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdFkfsEnum.java | 25 +++++++++++++++++++++++++ backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZffsEnum.java | 29 +++++++++++++++++++++++++++++ backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZflxEnum.java | 18 ++++++++++++++++++ backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdlyEnum.java | 6 +++--- backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdpsfsEnum.java | 4 ++-- backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdztEnum.java | 39 ++++++++++++++------------------------- backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/SysEnum.java | 13 +++++++++++++ backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MDdController.java | 4 ++-- backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MDdManagerImpl.java | 10 +++++----- backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java | 7 ++++--- backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/PayTypeEnum.java | 11 ----------- backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/TradeTypeEnum.java | 15 --------------- backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/DdManager.java | 2 +- backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/DdManagerImpl.java | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------- backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WxPayManagerImpl.java | 19 +++++++++++-------- backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/YgxxManagerImpl.java | 2 +- backend/lpg-user/src/main/java/com/hotent/lpg/user/util/WxPayConfiguration.java | 2 +- backend/lpg/src/main/java/com/hotent/lpg/controller/WDdController.java | 4 ++-- backend/lpg/src/main/java/com/hotent/lpg/controller/yg/WStaffOrderController.java | 4 ++-- backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WDdManagerImpl.java | 10 +++++----- backend/lpg/src/main/resources/mapper/WDdMapper.xml | 28 ++++++++++++++-------------- 24 files changed, 256 insertions(+), 198 deletions(-) delete mode 100644 backend/bpm-runtime/src/main/java/com/hotent/runtime/model/enums/UserParamsEnums.java create mode 100644 backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdFkfsEnum.java create mode 100644 backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZffsEnum.java create mode 100644 backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZflxEnum.java create mode 100644 backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/SysEnum.java delete mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/PayTypeEnum.java delete mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/TradeTypeEnum.java diff --git a/backend/README.md b/backend/README.md index 8b299f3..2a265be 100644 --- a/backend/README.md +++ b/backend/README.md @@ -10,3 +10,18 @@ [lpg](lpg)：不再维护，后续逐一移除 + + + + + + +# 枚举记录表 + +## 模块名称与枚举作用 + +| 模块名称 | 枚举名称 | 作用描述 | 说明1 | 说明2 | +|------|------|--------------------------------------------------------------------------------------------|----------------------|----------------------------------------| +| 系统 | 是否枚举 | 0：否
1：是 | | | +| 订单 | 订单状态 | 201:订单已创建
202：订单已支付
203：订单已发货
204：订单已完成
205：订单已取消
206：订单退款中
207：订单已退款 | | | + | diff --git a/backend/bpm-runtime/src/main/java/com/hotent/runtime/model/enums/UserParamsEnums.java b/backend/bpm-runtime/src/main/java/com/hotent/runtime/model/enums/UserParamsEnums.java deleted file mode 100644 index 9ca72ec..0000000 --- a/backend/bpm-runtime/src/main/java/com/hotent/runtime/model/enums/UserParamsEnums.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.hotent.runtime.model.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@AllArgsConstructor -@Getter -public enum UserParamsEnums { - dqzz("dqzz", "当前组织"); - private final String code; - private final String info; -} diff --git a/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java b/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java index e032b95..fa9ce95 100644 --- a/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java +++ b/backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java @@ -20,7 +20,6 @@ import com.hotent.base.datasource.DatabaseContext; import com.hotent.base.manager.CommonManager; import com.hotent.base.util.*; import com.hotent.base.util.Base64; -import com.hotent.runtime.model.enums.UserParamsEnums; import com.hotent.runtime.utils.SubCalcUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.exception.ExceptionUtils; @@ -1774,7 +1773,7 @@ public class ScriptImpl implements IScript { //获取指定用户当前所属组织 public ArrayList getCurrentOrg(String account){ ArrayList orgIds = new ArrayList(); - ObjectNode listOrgs = uCFeignService.getUserParamByCode(account, UserParamsEnums.dqzz.getCode()); + ObjectNode listOrgs = uCFeignService.getUserParamByCode(account,"dqzz"); if (BeanUtils.isNotEmpty(listOrgs)) { orgIds.add(listOrgs.get("value").asText()); } @@ -1873,12 +1872,12 @@ public class ScriptImpl implements IScript { } } else if (LOGIN_USER_CURORGS.equals(type)) { //当前登陆用户 当前所在组织 - ObjectNode listOrgs = uCFeignService.getUserParamByCode(currentUser.getAccount(), UserParamsEnums.dqzz.getCode()); + ObjectNode listOrgs = uCFeignService.getUserParamByCode(currentUser.getAccount(), "dqzz"); if (BeanUtils.isNotEmpty(listOrgs)) { orgIds.add(listOrgs.get("value").asText()); } }else if (LOGIN_USER_SUB_CURORGS.equals(type)){ - ObjectNode listOrgs = uCFeignService.getUserParamByCode(currentUser.getAccount(), UserParamsEnums.dqzz.getCode()); + ObjectNode listOrgs = uCFeignService.getUserParamByCode(currentUser.getAccount(), "dqzz"); if (BeanUtils.isNotEmpty(listOrgs)) { orgIds.add(listOrgs.get("value").asText()); List value = uCFeignService.getChildOrg(listOrgs.get("value").asText()); diff --git a/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdFkfsEnum.java b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdFkfsEnum.java new file mode 100644 index 0000000..651c3e5 --- /dev/null +++ b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdFkfsEnum.java @@ -0,0 +1,25 @@ +package com.hotent.lpg.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 支付方式枚举 + */ +@AllArgsConstructor +@Getter +public enum DdFkfsEnum { + + /** + * 货到付款 + */ + CASH_ON_DELIVERY("1", "货到付款"), + + /** + * 在线支付 + */ + ONLINE_PAYMENT("2", "在线支付"); + + private final String code; + private final String info; +} diff --git a/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZffsEnum.java b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZffsEnum.java new file mode 100644 index 0000000..4b013ba --- /dev/null +++ b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZffsEnum.java @@ -0,0 +1,29 @@ +package com.hotent.lpg.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 支付方式枚举 + */ +@AllArgsConstructor +@Getter +public enum DdZffsEnum { + /** + * 现金支付 + */ + CASH("CASH", "现金支付"), + + /** + * 微信支付 + */ + WX_PAY("WX_PAY", "微信支付"), + + /** + * 支付宝支付 + */ + ALI_PAY("ALI_PAY", "支付宝支付"); + + private final String code; + private final String info; +} diff --git a/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZflxEnum.java b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZflxEnum.java new file mode 100644 index 0000000..c3f53a1 --- /dev/null +++ b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZflxEnum.java @@ -0,0 +1,18 @@ +package com.hotent.lpg.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 支付类型 + */ +@AllArgsConstructor +@Getter +public enum DdZflxEnum { + APP("APP", "移动应用内的支付场景"), + NATIVE("NATIVE", "线下消费场景"), + JSAPI("JSAPI", "公众号内或者微信内的网页支付"), + MWEB("MWEB", "手机浏览器中的支付场景"); + private final String code; + private final String info; +} diff --git a/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdlyEnum.java b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdlyEnum.java index e6ec44e..9188919 100644 --- a/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdlyEnum.java +++ b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdlyEnum.java @@ -9,9 +9,9 @@ import lombok.Getter; @AllArgsConstructor @Getter public enum DdlyEnum { - xsxd("xsxd", "线上下单"), - wdps("wdps", "无单配送"), - bzxd("bzxd", "帮助下单"); + xsxd("1", "线上下单"), + wdps("2", "无单配送"), + bzxd("3", "帮助下单"); private final String code; private final String info; } diff --git a/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdpsfsEnum.java b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdpsfsEnum.java index 06dc271..ff266f7 100644 --- a/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdpsfsEnum.java +++ b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdpsfsEnum.java @@ -13,12 +13,12 @@ public enum DdpsfsEnum { /** * 配送 */ - ps("ps", "配送"), + ps("1", "配送"), /** * 自提 */ - zt("zt", "自提"); + zt("2", "自提"); private final String code; private final String info; diff --git a/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdztEnum.java b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdztEnum.java index 215cd13..43e0a0e 100644 --- a/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdztEnum.java +++ b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdztEnum.java @@ -11,32 +11,21 @@ import lombok.Getter; public enum DdztEnum { - /** - * 待支付 - */ - dzf("dzf", "待支付"), - /** - * 退款中 - */ - tkz("tkz", "退款中"), - /** - * 待配送 - */ - dps("dps", "待配送"), - - /** - * 配送中 - */ - psz("psz", "配送中"), - /** - * 已完成 - */ - ywc("ywc", "已完成"), - /** - * 已取消 - */ - yqx("yqx", "已取消"); + // 订单已创建，但尚未进行支付 + CREATED("201", "待支付"), + // 订单已支付，等待发货 + PAID("202", "待配送"), + // 订单已发货 + SHIPPED("203", "配送中"), + // 订单已完成，即客户已收到商品并确认 + COMPLETED("204", "已完成"), + // 订单已取消，可能由客户或系统发起 + CANCELLED("205", "取消中"), + // 订单退款中 + REFUNDING("206", "退款中"), + // 订单已退款 + REFUNDED("207", "已取消"); private final String code; private final String info; diff --git a/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/SysEnum.java b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/SysEnum.java new file mode 100644 index 0000000..5c0fbf2 --- /dev/null +++ b/backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/SysEnum.java @@ -0,0 +1,13 @@ +package com.hotent.lpg.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum SysEnum { + Y("1", "是"), + N("0", "否"); + private final String code; + private final String info; +} diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MDdController.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MDdController.java index 5eff83c..a73234a 100644 --- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MDdController.java +++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MDdController.java @@ -75,10 +75,10 @@ public class MDdController { if (wdd == null) { return new CommonResult(false, "订单信息不存在"); } - if (DdztEnum.ywc.getInfo().equals(wdd.getFDdzt())) { + if (DdztEnum.COMPLETED.getCode().equals(wdd.getFDdzt())) { return new CommonResult(false, "订单已完成，不可再次操作"); } - if (DdztEnum.yqx.getInfo().equals(wdd.getFDdzt())) { + if (DdztEnum.REFUNDED.getCode().equals(wdd.getFDdzt())) { return new CommonResult(false, "订单已取消，不可再次操作"); } //获取当前员工在uc_user表中的信息 diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MDdManagerImpl.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MDdManagerImpl.java index bf27055..98e6062 100644 --- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MDdManagerImpl.java +++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MDdManagerImpl.java @@ -129,7 +129,7 @@ public class MDdManagerImpl extends BaseManagerImpl implements MDdM dd.setFDdly(request.getDdly()); dd.setFZffs(null); dd.setFPsfs(request.getPsfs()); - dd.setFDdzt(DdztEnum.dps.getInfo()); + dd.setFDdzt(DdztEnum.PAID.getCode()); dd.setFMjly(request.getMjly()); dd.setFBz(request.getBz()); @@ -186,8 +186,8 @@ public class MDdManagerImpl extends BaseManagerImpl implements MDdM if (ObjectUtil.isNull(dd)) { throw new RuntimeException("参数错误:订单不存在"); } - if (DdztEnum.dps.getInfo().equals(dd.getFDdzt()) || DdztEnum.psz.getInfo().equals(dd.getFDdzt())) { - dd.setFDdzt(DdztEnum.yqx.getInfo()); + if (DdztEnum.PAID.getCode().equals(dd.getFDdzt()) || DdztEnum.SHIPPED.getCode().equals(dd.getFDdzt())) { + dd.setFDdzt(DdztEnum.REFUNDED.getCode()); ddDao.updateById(dd); } else { throw new RuntimeException("订单状态不正确"); @@ -264,7 +264,7 @@ public class MDdManagerImpl extends BaseManagerImpl implements MDdM //订单数据 wDd.setFPsrid(wYgxx.getId());//配送人id wDd.setFPsfs(DdpsfsEnum.ps.getInfo());//配送方式 - wDd.setFDdzt(DdztEnum.ywc.getInfo());//订单状态 + wDd.setFDdzt(DdztEnum.COMPLETED.getCode());//订单状态 wDd.setFBz(khxx.getBz());//备注 wDd.setFSjwcsj(now_string);//实际完成时间 wDd.setFGxr(wYgxx.getFXm());//更新人 @@ -583,7 +583,7 @@ public class MDdManagerImpl extends BaseManagerImpl implements MDdM wHyyqjlManager.updateWhyyqjlList(wQpssxxList_kphs, wYgxx, now_string, now); wHyyqjlManager.updateWhyyqjlList(wQpssxxList_mphs, wYgxx, now_string, now); - wdd.setFDdzt(DdztEnum.ywc.getInfo()); + wdd.setFDdzt(DdztEnum.COMPLETED.getCode()); wdd.setFSjwcsj(now_string); wdd.setFGxr(wYgxx.getFXm()); wdd.setFGxsj(now); diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java index a219385..6c00b25 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hotent.base.model.CommonResult; import com.hotent.lpg.common.enums.DdlyEnum; import com.hotent.lpg.common.enums.DdztEnum; +import com.hotent.lpg.common.enums.SysEnum; import com.hotent.lpg.common.enums.UserlxEnum; import com.hotent.lpg.common.model.WDd; import com.hotent.lpg.common.model.WHydz; @@ -156,7 +157,7 @@ public class DdConroller { ddDto.setJd(hydz.getFJd()); ddDto.setWd(hydz.getFWd()); - ddDto.setSfhy("是"); + ddDto.setSfhy(SysEnum.Y.getCode()); ddDto.setHydh(hyxx.getFSjh()); //账号就是电话 ddDto.setHyid(hyxx.getFUserid()); ddDto.setHymc(hyxx.getFXm()); @@ -167,8 +168,8 @@ public class DdConroller { ddDto.setXdrlx(UserlxEnum.hy.getInfo()); ddDto.setXdrid(ContextUtil.getCurrentUserId()); ddDto.setXdrmc(ContextUtil.getCurrentUser().getFullname()); - ddDto.setDdly(DdlyEnum.xsxd.getInfo()); - ddDto.setDdzt(DdztEnum.dzf.getInfo()); + ddDto.setDdly(DdlyEnum.xsxd.getCode()); + ddDto.setDdzt(DdztEnum.CREATED.getCode()); WDd order = wDdManager.addOrder(ddDto); log.warn("创建订单2：{}", order); HashMap resultData = wxPayManager.generatePrepayOrder(order, ddDto.getOpenId()); diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/PayTypeEnum.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/PayTypeEnum.java deleted file mode 100644 index 62ef183..0000000 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/PayTypeEnum.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hotent.lpg.user.enums; -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum PayTypeEnum { - WX("微信"); - - private String name; -} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/TradeTypeEnum.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/TradeTypeEnum.java deleted file mode 100644 index a1c9f11..0000000 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/TradeTypeEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hotent.lpg.user.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum TradeTypeEnum { - APP("APP"), - NATIVE("NATIVE"), - JSAPI("JSAPI"), - MWEB("MWEB"); - - private String code; -} diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/DdManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/DdManager.java index 2a7e5a7..02f1ea4 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/DdManager.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/DdManager.java @@ -29,7 +29,7 @@ public interface DdManager extends BaseManager { void cancel(String ddid); - WDd createOrder(DdDto request); +// WDd createOrder(DdDto request); diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/DdManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/DdManagerImpl.java index 6f3df0d..c04d61c 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/DdManagerImpl.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/DdManagerImpl.java @@ -13,8 +13,7 @@ import com.hotent.base.id.IdGenerator; import com.hotent.base.manager.impl.BaseManagerImpl; import com.hotent.base.util.BeanUtils; import com.hotent.base.util.StringUtil; -import com.hotent.lpg.common.enums.DdfwlxEnum; -import com.hotent.lpg.common.enums.DdztEnum; +import com.hotent.lpg.common.enums.*; import com.hotent.lpg.common.model.WDd; import com.hotent.lpg.common.model.WDdxq; import com.hotent.lpg.common.model.WHyyqjl; @@ -82,95 +81,100 @@ public class DdManagerImpl extends BaseManagerImpl implements DdMana if (ObjectUtil.isNull(dd)) { throw new RuntimeException("参数错误:订单不存在"); } - if (!(DdztEnum.dps.getInfo().equals(dd.getFDdzt()) || DdztEnum.psz.getInfo().equals(dd.getFDdzt()) || DdztEnum.dzf.getInfo().equals(dd.getFDdzt()))) { + if (!(DdztEnum.CREATED.getCode().equals(dd.getFDdzt()) + || DdztEnum.PAID.getCode().equals(dd.getFDdzt()) + || DdztEnum.SHIPPED.getCode().equals(dd.getFDdzt()))) { throw new RuntimeException("订单状态不正确"); } -// dd.setFDdzt(DdztEnum.yqx.getInfo()); -// baseMapper.updateById(dd); - if (dd.getFDdly().equals("线上下单") && dd.getFZffs().equals("微信") && dd.getFSfzf().equals("是")) { + + if (dd.getFDdly().equals(DdlyEnum.xsxd.getCode()) && dd.getFZffs().equals(DdZffsEnum.WX_PAY.getCode()) && dd.getFSfzf().equals(SysEnum.Y.getCode())) { //线上下单+微信支付+已支付 才退款 String shtkdh = wxPayManager.initiateRefundOrder(ddid); - dd.setFDdzt(DdztEnum.tkz.getInfo()); + dd.setFDdzt(DdztEnum.REFUNDING.getCode()); dd.setFShtkdh(shtkdh); - dd.setFSftk("否"); + dd.setFSftk(SysEnum.N.getCode()); + baseMapper.updateById(dd); + }else { + dd.setFDdzt(DdztEnum.REFUNDED.getCode()); + dd.setFSftk(SysEnum.N.getCode()); baseMapper.updateById(dd); } //添加服务日志 // wDdfwrzManager.insertDdfwrz(DdfwlxEnum.qxdd.getCode(), dd.getId()); } - @Override - @Transactional(rollbackFor = Exception.class) - public WDd createOrder(DdDto request) { - WQplx qplx = qplxDao.selectById(request.getXqList().get(0).getQplxId()); - WDd dd = new WDd(); - dd.setId(idGenerator.getSuid()); - - dd.setFSfhy(request.getSfhy()); - dd.setFHyyhid(request.getHyid()); - dd.setFHymc(request.getHymc()); - dd.setFHylx(request.getHylx()); - dd.setFHydh(request.getHydh()); - - dd.setFShtysbm(request.getShtysbm()); - dd.setFSfzh(request.getSfzh()); - - dd.setFDdlx(null); - dd.setFDddh(idGenerator.getSuid()); - dd.setFDdly(request.getDdly()); - dd.setFZffs(null); - dd.setFPsfs(request.getPsfs()); - dd.setFDdzt(DdztEnum.dps.getInfo()); - dd.setFMjly(request.getMjly()); - dd.setFBz(request.getBz()); - - dd.setFCzid(qplx.getfSsczid()); - dd.setFCzmc(qplx.getfSsczmc()); - dd.setFQyid(qplx.getfSsqyid()); - - dd.setFXdrlx(request.getXdrlx()); - dd.setFXdrid(request.getXdrid()); - dd.setFXdrmc(request.getXdrmc()); - dd.setFShlxr(request.getShlxr()); - dd.setFShlxrdh(request.getShlxrdh()); - dd.setFShsf(request.getShsf()); - dd.setFShs(request.getShs()); - dd.setFShq(request.getShq()); - dd.setFShjd(request.getShjd()); - dd.setFShxxdz(request.getShxxdz()); - dd.setFCjr(ContextUtil.getCurrentUser().getFullname()); - dd.setFCjsj(LocalDateTime.now()); - dd.setFGxr(ContextUtil.getCurrentUser().getFullname()); - dd.setFGxsj(LocalDateTime.now()); - dd.setFShdzjd(request.getJd()); - dd.setFShdzwd(request.getWd()); - BigDecimal ddje = new BigDecimal(0); - List ddxqList = new ArrayList(); - for (DdDto.XqVO xqVO : request.getXqList()) { - WQplx wQplx = qplxDao.selectById(xqVO.getQplxId()); - if (ObjectUtil.isNull(wQplx)) { - throw new RuntimeException("商品信息不存在"); - } - ddje = NumberUtil.add(ddje, NumberUtil.mul(wQplx.getfJg(), xqVO.getSl())); - WDdxq ddxq = new WDdxq(); - ddxq.setfDdid(dd.getId()); - ddxq.setfQplxid(wQplx.getId()); - ddxq.setfSpmc(wQplx.getfMc()); - ddxq.setfTp(wQplx.getfTp()); - ddxq.setfSl(BigDecimal.valueOf(xqVO.getSl())); - ddxq.setfDj(wQplx.getfJg()); - ddxq.setfMs(wQplx.getfMs()); - ddxqDao.insert(ddxq); - ddxqList.add(ddxq); - } - dd.setFDdje(ddje); - dd.setDdxqList(ddxqList); - baseMapper.insert(dd); - //添加服务日志 - wDdfwrzManager.insertDdfwrz(DdfwlxEnum.cjdd.getCode(), dd.getId()); - return dd; - } +// @Override +// @Transactional(rollbackFor = Exception.class) +// public WDd createOrder(DdDto request) { +// WQplx qplx = qplxDao.selectById(request.getXqList().get(0).getQplxId()); +// WDd dd = new WDd(); +// dd.setId(idGenerator.getSuid()); +// +// dd.setFSfhy(request.getSfhy()); +// dd.setFHyyhid(request.getHyid()); +// dd.setFHymc(request.getHymc()); +// dd.setFHylx(request.getHylx()); +// dd.setFHydh(request.getHydh()); +// +// dd.setFShtysbm(request.getShtysbm()); +// dd.setFSfzh(request.getSfzh()); +// +// dd.setFDdlx(null); +// dd.setFDddh(idGenerator.getSuid()); +// dd.setFDdly(request.getDdly()); +// dd.setFZffs(null); +// dd.setFPsfs(request.getPsfs()); +// dd.setFDdzt(DdztEnum.PAID.getCode()); +// dd.setFMjly(request.getMjly()); +// dd.setFBz(request.getBz()); +// +// dd.setFCzid(qplx.getfSsczid()); +// dd.setFCzmc(qplx.getfSsczmc()); +// dd.setFQyid(qplx.getfSsqyid()); +// +// dd.setFXdrlx(request.getXdrlx()); +// dd.setFXdrid(request.getXdrid()); +// dd.setFXdrmc(request.getXdrmc()); +// dd.setFShlxr(request.getShlxr()); +// dd.setFShlxrdh(request.getShlxrdh()); +// dd.setFShsf(request.getShsf()); +// dd.setFShs(request.getShs()); +// dd.setFShq(request.getShq()); +// dd.setFShjd(request.getShjd()); +// dd.setFShxxdz(request.getShxxdz()); +// dd.setFCjr(ContextUtil.getCurrentUser().getFullname()); +// dd.setFCjsj(LocalDateTime.now()); +// dd.setFGxr(ContextUtil.getCurrentUser().getFullname()); +// dd.setFGxsj(LocalDateTime.now()); +// dd.setFShdzjd(request.getJd()); +// dd.setFShdzwd(request.getWd()); +// BigDecimal ddje = new BigDecimal(0); +// List ddxqList = new ArrayList(); +// for (DdDto.XqVO xqVO : request.getXqList()) { +// WQplx wQplx = qplxDao.selectById(xqVO.getQplxId()); +// if (ObjectUtil.isNull(wQplx)) { +// throw new RuntimeException("商品信息不存在"); +// } +// ddje = NumberUtil.add(ddje, NumberUtil.mul(wQplx.getfJg(), xqVO.getSl())); +// WDdxq ddxq = new WDdxq(); +// ddxq.setfDdid(dd.getId()); +// ddxq.setfQplxid(wQplx.getId()); +// ddxq.setfSpmc(wQplx.getfMc()); +// ddxq.setfTp(wQplx.getfTp()); +// ddxq.setfSl(BigDecimal.valueOf(xqVO.getSl())); +// ddxq.setfDj(wQplx.getfJg()); +// ddxq.setfMs(wQplx.getfMs()); +// ddxqDao.insert(ddxq); +// ddxqList.add(ddxq); +// } +// dd.setFDdje(ddje); +// dd.setDdxqList(ddxqList); +// baseMapper.insert(dd); +// //添加服务日志 +// wDdfwrzManager.insertDdfwrz(DdfwlxEnum.cjdd.getCode(), dd.getId()); +// return dd; +// } @Override public IPage pageList(Page page, String zt, String hyid) { @@ -226,9 +230,9 @@ public class DdManagerImpl extends BaseManagerImpl implements DdMana dd.setFDdly(ddDto.getDdly()); dd.setFZffs(ddDto.getZffs()); dd.setFZflx(ddDto.getZflx()); - dd.setFSfzf("否"); + dd.setFSfzf(SysEnum.N.getCode()); dd.setFPsfs(ddDto.getPsfs()); - dd.setFDdzt(StringUtil.isEmail(ddDto.getDdzt()) ? DdztEnum.dps.getInfo() : ddDto.getDdzt()); + dd.setFDdzt(StringUtil.isEmail(ddDto.getDdzt()) ? DdztEnum.PAID.getCode() : ddDto.getDdzt()); dd.setFMjly(ddDto.getMjly()); dd.setFBz(ddDto.getBz()); dd.setFCzid(qplx.getfSsczid()); @@ -273,7 +277,7 @@ public class DdManagerImpl extends BaseManagerImpl implements DdMana dd.setDdxqList(ddxqList); baseMapper.insert(dd); //添加服务日志 - wDdfwrzManager.insertDdfwrz(DdfwlxEnum.cjdd.getCode(), dd.getId()); +// wDdfwrzManager.insertDdfwrz(DdfwlxEnum.cjdd.getCode(), dd.getId()); return dd; } } diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WxPayManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WxPayManagerImpl.java index 0a39997..2ae4b15 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WxPayManagerImpl.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WxPayManagerImpl.java @@ -13,7 +13,10 @@ import com.github.binarywang.wxpay.bean.result.WxPayRefundResult; import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; import com.hotent.base.util.BeanUtils; +import com.hotent.lpg.common.enums.DdZffsEnum; +import com.hotent.lpg.common.enums.DdlyEnum; import com.hotent.lpg.common.enums.DdztEnum; +import com.hotent.lpg.common.enums.SysEnum; import com.hotent.lpg.common.model.WCzzfpz; import com.hotent.lpg.common.model.WDd; import com.hotent.lpg.user.dao.CzzfpzDao; @@ -63,10 +66,10 @@ public class WxPayManagerImpl implements WxPayManager { public String initiateRefundOrder(String ddid) { // 1. 查询订单信息 WDd wDd = ddDao.selectById(ddid); - if (!DdztEnum.dps.getInfo().equals(wDd.getFDdzt())) { + if (!DdztEnum.REFUNDING.getCode().equals(wDd.getFDdzt())) { throw new RuntimeException("订单状态不正确"); } - if (!(wDd.getFDdly().equals("线上下单") && wDd.getFZffs().equals("微信") && wDd.getFSfzf().equals("是"))) { + if (wDd.getFDdly().equals(DdlyEnum.xsxd.getCode()) && wDd.getFZffs().equals(DdZffsEnum.WX_PAY.getCode()) && wDd.getFSfzf().equals(SysEnum.Y.getCode())) { throw new RuntimeException("订单状态不正确"); } // 2. 获取支付配置 @@ -130,12 +133,12 @@ public class WxPayManagerImpl implements WxPayManager { if (wDd == null) { return generateXmlResponse("FAIL", "未查询到订单", outTradeNo); } - if (wDd.getFSftk().equals("是")){ + if (wDd.getFSftk().equals(SysEnum.Y.getCode())){ return generateXmlResponse("FAIL", "订单已退款", outTradeNo); } // 5. 更新订单状态 - wDd.setFDdzt(DdztEnum.yqx.getInfo()); - wDd.setFSftk("是"); + wDd.setFDdzt(DdztEnum.REFUNDED.getCode()); + wDd.setFSftk(SysEnum.Y.getCode()); wDd.setFTkdh(refundId); wDd.setFTksj(LocalDateTimeUtils.parse(successTime)); ddDao.updateById(wDd); @@ -179,7 +182,7 @@ public class WxPayManagerImpl implements WxPayManager { return generateXmlResponse("FAIL", "订单不存在", dddh); } // 检查订单状态是否已支付 - if ("已支付".equals(wDd.getFDdzt())) { + if (SysEnum.Y.getCode().equals(wDd.getFDdzt())) { log.warn("订单 {} 已经处理过，忽略本次通知", dddh); return generateXmlResponse("SUCCESS", "已处理过", dddh); } @@ -192,8 +195,8 @@ public class WxPayManagerImpl implements WxPayManager { String timeEnd = notifyResult.getTimeEnd(); LocalDateTime paymentTime = LocalDateTimeUtils.parse(timeEnd); wDd.setFFksj(paymentTime); - wDd.setFSfzf("是"); - wDd.setFDdzt("待配送"); + wDd.setFSfzf(SysEnum.Y.getCode()); + wDd.setFDdzt(DdztEnum.PAID.getCode()); wDd.setFZfdh(transactionId); ddDao.updateById(wDd); diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/YgxxManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/YgxxManagerImpl.java index 28cc115..cc8edcc 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/YgxxManagerImpl.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/YgxxManagerImpl.java @@ -75,7 +75,7 @@ public class YgxxManagerImpl extends BaseManagerImpl implements } QueryWrapper queryWrapperWDd = new QueryWrapper<>(); queryWrapperWDd.select("id_"); - queryWrapperWDd.eq("F_psrID", wYgxx.getId()).eq("F_ddzt", DdztEnum.ywc.getInfo()); + queryWrapperWDd.eq("F_psrID", wYgxx.getId()).eq("F_ddzt", DdztEnum.COMPLETED.getCode()); List wDdList = ddManager.list(queryWrapperWDd); if (ObjectUtils.isNotEmpty(wDdList)) { scanCodeYgxxVO.setLjpsdd(wDdList.size() + ""); diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/util/WxPayConfiguration.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/util/WxPayConfiguration.java index 59b9d3a..56b570b 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/util/WxPayConfiguration.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/util/WxPayConfiguration.java @@ -8,7 +8,7 @@ import com.hotent.lpg.common.model.WCzzfpz; public class WxPayConfiguration { - public static final String hostUrl = "http://qyhtiz.natappfree.cc/api"; + public static final String hostUrl = "http://m8wgk2.natappfree.cc"; public static WxPayService getPayService(WCzzfpz wCzzfpz) { WxPayConfig wxPayConfig = new WxPayConfig(); wxPayConfig.setAppId(wCzzfpz.getFAppid()); // appId（应用id）（微信支付商户平台获取） diff --git a/backend/lpg/src/main/java/com/hotent/lpg/controller/WDdController.java b/backend/lpg/src/main/java/com/hotent/lpg/controller/WDdController.java index 57e41d5..66d5eaf 100644 --- a/backend/lpg/src/main/java/com/hotent/lpg/controller/WDdController.java +++ b/backend/lpg/src/main/java/com/hotent/lpg/controller/WDdController.java @@ -85,10 +85,10 @@ public class WDdController extends BaseController { if (wdd == null) { return new CommonResult(false, "订单信息不存在"); } - if (DdztEnum.ywc.getInfo().equals(wdd.getFDdzt())) { + if (DdztEnum.COMPLETED.getCode().equals(wdd.getFDdzt())) { return new CommonResult(false, "订单已完成，不可再次操作"); } - if (DdztEnum.yqx.getInfo().equals(wdd.getFDdzt())) { + if (DdztEnum.REFUNDED.getCode().equals(wdd.getFDdzt())) { return new CommonResult(false, "订单已取消，不可再次操作"); } //获取当前员工在uc_user表中的信息 diff --git a/backend/lpg/src/main/java/com/hotent/lpg/controller/yg/WStaffOrderController.java b/backend/lpg/src/main/java/com/hotent/lpg/controller/yg/WStaffOrderController.java index abafb30..e36bee2 100644 --- a/backend/lpg/src/main/java/com/hotent/lpg/controller/yg/WStaffOrderController.java +++ b/backend/lpg/src/main/java/com/hotent/lpg/controller/yg/WStaffOrderController.java @@ -67,10 +67,10 @@ public class WStaffOrderController { if (wdd == null) { return new CommonResult(false, "订单信息不存在"); } - if (DdztEnum.ywc.getInfo().equals(wdd.getFDdzt())) { + if (DdztEnum.COMPLETED.getCode().equals(wdd.getFDdzt())) { return new CommonResult(false, "订单已完成，不可再次操作"); } - if (DdztEnum.yqx.getInfo().equals(wdd.getFDdzt())) { + if (DdztEnum.REFUNDED.getCode().equals(wdd.getFDdzt())) { return new CommonResult(false, "订单已取消，不可再次操作"); } //获取当前员工在uc_user表中的信息 diff --git a/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WDdManagerImpl.java b/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WDdManagerImpl.java index b8c3e20..0231f97 100644 --- a/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WDdManagerImpl.java +++ b/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WDdManagerImpl.java @@ -132,7 +132,7 @@ public class WDdManagerImpl extends BaseManagerImpl implements WDdM dd.setFDdly(request.getDdly()); dd.setFZffs(null); dd.setFPsfs(request.getPsfs()); - dd.setFDdzt(DdztEnum.dps.getInfo()); + dd.setFDdzt(DdztEnum.PAID.getCode()); dd.setFMjly(request.getMjly()); dd.setFBz(request.getBz()); @@ -189,8 +189,8 @@ public class WDdManagerImpl extends BaseManagerImpl implements WDdM if (ObjectUtil.isNull(dd)) { throw new RuntimeException("参数错误:订单不存在"); } - if (DdztEnum.dps.getInfo().equals(dd.getFDdzt()) || DdztEnum.psz.getInfo().equals(dd.getFDdzt())) { - dd.setFDdzt(DdztEnum.yqx.getInfo()); + if (DdztEnum.PAID.getCode().equals(dd.getFDdzt()) || DdztEnum.SHIPPED.getCode().equals(dd.getFDdzt())) { + dd.setFDdzt(DdztEnum.REFUNDED.getCode()); ddDao.updateById(dd); } else { throw new RuntimeException("订单状态不正确"); @@ -267,7 +267,7 @@ public class WDdManagerImpl extends BaseManagerImpl implements WDdM //订单数据 wDd.setFPsrid(wYgxx.getId());//配送人id wDd.setFPsfs(DdpsfsEnum.ps.getInfo());//配送方式 - wDd.setFDdzt(DdztEnum.ywc.getInfo());//订单状态 + wDd.setFDdzt(DdztEnum.COMPLETED.getCode());//订单状态 wDd.setFBz(khxx.getBz());//备注 wDd.setFSjwcsj(now_string);//实际完成时间 wDd.setFGxr(wYgxx.getFXm());//更新人 @@ -588,7 +588,7 @@ public class WDdManagerImpl extends BaseManagerImpl implements WDdM wHyyqjlManager.updateWhyyqjlList(wQpssxxList_kphs, wYgxx, now_string, now); wHyyqjlManager.updateWhyyqjlList(wQpssxxList_mphs, wYgxx, now_string, now); - wdd.setFDdzt(DdztEnum.ywc.getInfo()); + wdd.setFDdzt(DdztEnum.COMPLETED.getCode()); wdd.setFSjwcsj(now_string); wdd.setFGxr(wYgxx.getFXm()); wdd.setFGxsj(now); diff --git a/backend/lpg/src/main/resources/mapper/WDdMapper.xml b/backend/lpg/src/main/resources/mapper/WDdMapper.xml index b1fb5a4..611936c 100644 --- a/backend/lpg/src/main/resources/mapper/WDdMapper.xml +++ b/backend/lpg/src/main/resources/mapper/WDdMapper.xml @@ -190,7 +190,7 @@ count(w_dd.F_ddly) number, date_format(w_dd.F_sjwcsj,'%H') as dateStr from w_dd w_dd - where w_dd.F_ddzt = '已完成' + where w_dd.F_ddzt = '204' and date_format(w_dd.F_sjwcsj,'%Y%m%d') = date_format(sysdate() ,'%Y%m%d') and w_dd.ID_ in (select F_ddID from w_ddpsxq wd) @@ -234,7 +234,7 @@ count(w_dd.F_ddly) number, date_format(w_dd.F_sjwcsj,'%Y%m%d') as dateStr from w_dd w_dd - where w_dd.F_ddzt = '已完成' + where w_dd.F_ddzt = '204' and week(w_dd.F_sjwcsj) = week(sysdate()) and w_dd.ID_ in (select F_ddID from w_ddpsxq wd) @@ -278,7 +278,7 @@ count(w_dd.F_ddly) number, date_format(w_dd.F_sjwcsj,'%Y%m%d') as dateStr from w_dd w_dd - where w_dd.F_ddzt = '已完成' + where w_dd.F_ddzt = '204' and month(w_dd.F_sjwcsj) = month(sysdate()) and w_dd.ID_ in (select F_ddID from w_ddpsxq wd) @@ -316,7 +316,7 @@ count(w_dd.F_ddly) number, month(w_dd.F_sjwcsj) as dateStr from w_dd w_dd - where w_dd.F_ddzt = '已完成' + where w_dd.F_ddzt = '204' and year(w_dd.F_sjwcsj) = year(sysdate()) and w_dd.ID_ in (select F_ddID from w_ddpsxq wd) @@ -356,7 +356,7 @@ from w_dd w_dd inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_ inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID - where w_dd.F_ddzt = '已完成' + where w_dd.F_ddzt = '204' and date_format(w_dd.F_sjwcsj,'%Y%m%d') = date_format(sysdate() ,'%Y%m%d') and w_dd.F_qyID = #{qyId} @@ -397,7 +397,7 @@ from w_dd w_dd inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_ inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID - where w_dd.F_ddzt = '已完成' + where w_dd.F_ddzt = '204' and week(w_dd.F_sjwcsj) = week(sysdate()) and w_dd.F_qyID = #{qyId} @@ -438,7 +438,7 @@ from w_dd w_dd inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_ inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID - where w_dd.F_ddzt = '已完成' + where w_dd.F_ddzt = '204' and month(w_dd.F_sjwcsj) = month(sysdate()) and w_dd.F_qyID = #{qyId} @@ -473,7 +473,7 @@ from w_dd w_dd inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_ inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID - where w_dd.F_ddzt = '已完成' + where w_dd.F_ddzt = '204' and year(w_dd.F_sjwcsj) = year(sysdate()) and w_dd.F_qyID = #{qyId} @@ -515,14 +515,14 @@ select * from w_dd w_dd - - and w_dd.F_ddzt in ('待配送','自提') + + and w_dd.F_ddzt in ('202','自提') - - and w_dd.F_ddzt = '配送中' + + and w_dd.F_ddzt = '203' - - and w_dd.F_ddzt = '已完成' + + and w_dd.F_ddzt = '204' -- libgit2 0.21.2