ZongYue / lpg

Download as
Browse Code »

Commit 1b62ea02d7ed62ce9d28aa47a6bca487bdbc3cf4

Authored by 陈威
1 parent 7fdc17fc
Exists in dev

统一订单状态

Showing 24 changed files with 256 additions and 198 deletions   Show diff stats
backend/README.md
  Diff comments   View file @1b62ea0
... ... @@ -10,3 +10,18 @@
10 10  
11 11  
12 12 [lpg](lpg)：不再维护，后续逐一移除
  13 +
  14 +
  15 +
  16 +
  17 +
  18 +
  19 +# 枚举记录表
  20 +
  21 +## 模块名称与枚举作用
  22 +
  23 +| 模块名称 | 枚举名称 | 作用描述 | 说明1 | 说明2 |
  24 +|------|------|--------------------------------------------------------------------------------------------|----------------------|----------------------------------------|
  25 +| 系统 | 是否枚举 | 0：否<br/> 1：是 | | |
  26 +| 订单 | 订单状态 | 201:订单已创建<br/> 202：订单已支付<br/>203：订单已发货<br/>204：订单已完成<br/>205：订单已取消 <br/>206：订单退款中<br/>207：订单已退款 | | |
  27 + |
... ...
backend/bpm-runtime/src/main/java/com/hotent/runtime/model/enums/UserParamsEnums.java
View file @7fdc17f
... ... @@ -1,12 +0,0 @@
1   -package com.hotent.runtime.model.enums;
2   -
3   -import lombok.AllArgsConstructor;
4   -import lombok.Getter;
5   -
6   -@AllArgsConstructor
7   -@Getter
8   -public enum UserParamsEnums {
9   - dqzz("dqzz", "当前组织");
10   - private final String code;
11   - private final String info;
12   -}
backend/bpm-runtime/src/main/java/com/hotent/runtime/script/ScriptImpl.java
  Diff comments   View file @1b62ea0
... ... @@ -20,7 +20,6 @@ import com.hotent.base.datasource.DatabaseContext;
20 20 import com.hotent.base.manager.CommonManager;
21 21 import com.hotent.base.util.*;
22 22 import com.hotent.base.util.Base64;
23   -import com.hotent.runtime.model.enums.UserParamsEnums;
24 23 import com.hotent.runtime.utils.SubCalcUtils;
25 24 import org.apache.commons.lang.StringUtils;
26 25 import org.apache.commons.lang.exception.ExceptionUtils;
... ... @@ -1774,7 +1773,7 @@ public class ScriptImpl implements IScript {
1774 1773 //获取指定用户当前所属组织
1775 1774 public ArrayList<String> getCurrentOrg(String account){
1776 1775 ArrayList<String> orgIds = new ArrayList<String>();
1777   - ObjectNode listOrgs = uCFeignService.getUserParamByCode(account, UserParamsEnums.dqzz.getCode());
  1776 + ObjectNode listOrgs = uCFeignService.getUserParamByCode(account,"dqzz");
1778 1777 if (BeanUtils.isNotEmpty(listOrgs)) {
1779 1778 orgIds.add(listOrgs.get("value").asText());
1780 1779 }
... ... @@ -1873,12 +1872,12 @@ public class ScriptImpl implements IScript {
1873 1872 }
1874 1873 } else if (LOGIN_USER_CURORGS.equals(type)) {
1875 1874 //当前登陆用户 当前所在组织
1876   - ObjectNode listOrgs = uCFeignService.getUserParamByCode(currentUser.getAccount(), UserParamsEnums.dqzz.getCode());
  1875 + ObjectNode listOrgs = uCFeignService.getUserParamByCode(currentUser.getAccount(), "dqzz");
1877 1876 if (BeanUtils.isNotEmpty(listOrgs)) {
1878 1877 orgIds.add(listOrgs.get("value").asText());
1879 1878 }
1880 1879 }else if (LOGIN_USER_SUB_CURORGS.equals(type)){
1881   - ObjectNode listOrgs = uCFeignService.getUserParamByCode(currentUser.getAccount(), UserParamsEnums.dqzz.getCode());
  1880 + ObjectNode listOrgs = uCFeignService.getUserParamByCode(currentUser.getAccount(), "dqzz");
1882 1881 if (BeanUtils.isNotEmpty(listOrgs)) {
1883 1882 orgIds.add(listOrgs.get("value").asText());
1884 1883 List<ObjectNode> value = uCFeignService.getChildOrg(listOrgs.get("value").asText());
... ...
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdFkfsEnum.java 0 → 100644
  Diff comments   View file @1b62ea0
... ... @@ -0,0 +1,25 @@
  1 +package com.hotent.lpg.common.enums;
  2 +
  3 +import lombok.AllArgsConstructor;
  4 +import lombok.Getter;
  5 +
  6 +/**
  7 + * 支付方式枚举
  8 + */
  9 +@AllArgsConstructor
  10 +@Getter
  11 +public enum DdFkfsEnum {
  12 +
  13 + /**
  14 + * 货到付款
  15 + */
  16 + CASH_ON_DELIVERY("1", "货到付款"),
  17 +
  18 + /**
  19 + * 在线支付
  20 + */
  21 + ONLINE_PAYMENT("2", "在线支付");
  22 +
  23 + private final String code;
  24 + private final String info;
  25 +}
... ...
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZffsEnum.java 0 → 100644
  Diff comments   View file @1b62ea0
... ... @@ -0,0 +1,29 @@
  1 +package com.hotent.lpg.common.enums;
  2 +
  3 +import lombok.AllArgsConstructor;
  4 +import lombok.Getter;
  5 +
  6 +/**
  7 + * 支付方式枚举
  8 + */
  9 +@AllArgsConstructor
  10 +@Getter
  11 +public enum DdZffsEnum {
  12 + /**
  13 + * 现金支付
  14 + */
  15 + CASH("CASH", "现金支付"),
  16 +
  17 + /**
  18 + * 微信支付
  19 + */
  20 + WX_PAY("WX_PAY", "微信支付"),
  21 +
  22 + /**
  23 + * 支付宝支付
  24 + */
  25 + ALI_PAY("ALI_PAY", "支付宝支付");
  26 +
  27 + private final String code;
  28 + private final String info;
  29 +}
... ...
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdZflxEnum.java 0 → 100644
  Diff comments   View file @1b62ea0
... ... @@ -0,0 +1,18 @@
  1 +package com.hotent.lpg.common.enums;
  2 +
  3 +import lombok.AllArgsConstructor;
  4 +import lombok.Getter;
  5 +
  6 +/**
  7 + * 支付类型
  8 + */
  9 +@AllArgsConstructor
  10 +@Getter
  11 +public enum DdZflxEnum {
  12 + APP("APP", "移动应用内的支付场景"),
  13 + NATIVE("NATIVE", "线下消费场景"),
  14 + JSAPI("JSAPI", "公众号内或者微信内的网页支付"),
  15 + MWEB("MWEB", "手机浏览器中的支付场景");
  16 + private final String code;
  17 + private final String info;
  18 +}
... ...
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdlyEnum.java
  Diff comments   View file @1b62ea0
... ... @@ -9,9 +9,9 @@ import lombok.Getter;
9 9 @AllArgsConstructor
10 10 @Getter
11 11 public enum DdlyEnum {
12   - xsxd("xsxd", "线上下单"),
13   - wdps("wdps", "无单配送"),
14   - bzxd("bzxd", "帮助下单");
  12 + xsxd("1", "线上下单"),
  13 + wdps("2", "无单配送"),
  14 + bzxd("3", "帮助下单");
15 15 private final String code;
16 16 private final String info;
17 17 }
... ...
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdpsfsEnum.java
  Diff comments   View file @1b62ea0
... ... @@ -13,12 +13,12 @@ public enum DdpsfsEnum {
13 13 /**
14 14 * 配送
15 15 */
16   - ps("ps", "配送"),
  16 + ps("1", "配送"),
17 17  
18 18 /**
19 19 * 自提
20 20 */
21   - zt("zt", "自提");
  21 + zt("2", "自提");
22 22  
23 23 private final String code;
24 24 private final String info;
... ...
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/DdztEnum.java
  Diff comments   View file @1b62ea0
... ... @@ -11,32 +11,21 @@ import lombok.Getter;
11 11 public enum DdztEnum {
12 12  
13 13  
14   - /**
15   - * 待支付
16   - */
17   - dzf("dzf", "待支付"),
18 14  
19   - /**
20   - * 退款中
21   - */
22   - tkz("tkz", "退款中"),
23   - /**
24   - * 待配送
25   - */
26   - dps("dps", "待配送"),
27   -
28   - /**
29   - * 配送中
30   - */
31   - psz("psz", "配送中"),
32   - /**
33   - * 已完成
34   - */
35   - ywc("ywc", "已完成"),
36   - /**
37   - * 已取消
38   - */
39   - yqx("yqx", "已取消");
  15 + // 订单已创建，但尚未进行支付
  16 + CREATED("201", "待支付"),
  17 + // 订单已支付，等待发货
  18 + PAID("202", "待配送"),
  19 + // 订单已发货
  20 + SHIPPED("203", "配送中"),
  21 + // 订单已完成，即客户已收到商品并确认
  22 + COMPLETED("204", "已完成"),
  23 + // 订单已取消，可能由客户或系统发起
  24 + CANCELLED("205", "取消中"),
  25 + // 订单退款中
  26 + REFUNDING("206", "退款中"),
  27 + // 订单已退款
  28 + REFUNDED("207", "已取消");
40 29  
41 30 private final String code;
42 31 private final String info;
... ...
backend/lpg-common/src/main/java/com/hotent/lpg/common/enums/SysEnum.java 0 → 100644
  Diff comments   View file @1b62ea0
... ... @@ -0,0 +1,13 @@
  1 +package com.hotent.lpg.common.enums;
  2 +
  3 +import lombok.AllArgsConstructor;
  4 +import lombok.Getter;
  5 +
  6 +@AllArgsConstructor
  7 +@Getter
  8 +public enum SysEnum {
  9 + Y("1", "是"),
  10 + N("0", "否");
  11 + private final String code;
  12 + private final String info;
  13 +}
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MDdController.java
  Diff comments   View file @1b62ea0
... ... @@ -75,10 +75,10 @@ public class MDdController {
75 75 if (wdd == null) {
76 76 return new CommonResult(false, "订单信息不存在");
77 77 }
78   - if (DdztEnum.ywc.getInfo().equals(wdd.getFDdzt())) {
  78 + if (DdztEnum.COMPLETED.getCode().equals(wdd.getFDdzt())) {
79 79 return new CommonResult(false, "订单已完成，不可再次操作");
80 80 }
81   - if (DdztEnum.yqx.getInfo().equals(wdd.getFDdzt())) {
  81 + if (DdztEnum.REFUNDED.getCode().equals(wdd.getFDdzt())) {
82 82 return new CommonResult(false, "订单已取消，不可再次操作");
83 83 }
84 84 //获取当前员工在uc_user表中的信息
... ...
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MDdManagerImpl.java
  Diff comments   View file @1b62ea0
... ... @@ -129,7 +129,7 @@ public class MDdManagerImpl extends BaseManagerImpl&lt;MDdDao, WDd&gt; implements MDdM
129 129 dd.setFDdly(request.getDdly());
130 130 dd.setFZffs(null);
131 131 dd.setFPsfs(request.getPsfs());
132   - dd.setFDdzt(DdztEnum.dps.getInfo());
  132 + dd.setFDdzt(DdztEnum.PAID.getCode());
133 133 dd.setFMjly(request.getMjly());
134 134 dd.setFBz(request.getBz());
135 135  
... ... @@ -186,8 +186,8 @@ public class MDdManagerImpl extends BaseManagerImpl&lt;MDdDao, WDd&gt; implements MDdM
186 186 if (ObjectUtil.isNull(dd)) {
187 187 throw new RuntimeException("参数错误:订单不存在");
188 188 }
189   - if (DdztEnum.dps.getInfo().equals(dd.getFDdzt()) || DdztEnum.psz.getInfo().equals(dd.getFDdzt())) {
190   - dd.setFDdzt(DdztEnum.yqx.getInfo());
  189 + if (DdztEnum.PAID.getCode().equals(dd.getFDdzt()) || DdztEnum.SHIPPED.getCode().equals(dd.getFDdzt())) {
  190 + dd.setFDdzt(DdztEnum.REFUNDED.getCode());
191 191 ddDao.updateById(dd);
192 192 } else {
193 193 throw new RuntimeException("订单状态不正确");
... ... @@ -264,7 +264,7 @@ public class MDdManagerImpl extends BaseManagerImpl&lt;MDdDao, WDd&gt; implements MDdM
264 264 //订单数据
265 265 wDd.setFPsrid(wYgxx.getId());//配送人id
266 266 wDd.setFPsfs(DdpsfsEnum.ps.getInfo());//配送方式
267   - wDd.setFDdzt(DdztEnum.ywc.getInfo());//订单状态
  267 + wDd.setFDdzt(DdztEnum.COMPLETED.getCode());//订单状态
268 268 wDd.setFBz(khxx.getBz());//备注
269 269 wDd.setFSjwcsj(now_string);//实际完成时间
270 270 wDd.setFGxr(wYgxx.getFXm());//更新人
... ... @@ -583,7 +583,7 @@ public class MDdManagerImpl extends BaseManagerImpl&lt;MDdDao, WDd&gt; implements MDdM
583 583 wHyyqjlManager.updateWhyyqjlList(wQpssxxList_kphs, wYgxx, now_string, now);
584 584 wHyyqjlManager.updateWhyyqjlList(wQpssxxList_mphs, wYgxx, now_string, now);
585 585  
586   - wdd.setFDdzt(DdztEnum.ywc.getInfo());
  586 + wdd.setFDdzt(DdztEnum.COMPLETED.getCode());
587 587 wdd.setFSjwcsj(now_string);
588 588 wdd.setFGxr(wYgxx.getFXm());
589 589 wdd.setFGxsj(now);
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/DdConroller.java
  Diff comments   View file @1b62ea0
... ... @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6 import com.hotent.base.model.CommonResult;
7 7 import com.hotent.lpg.common.enums.DdlyEnum;
8 8 import com.hotent.lpg.common.enums.DdztEnum;
  9 +import com.hotent.lpg.common.enums.SysEnum;
9 10 import com.hotent.lpg.common.enums.UserlxEnum;
10 11 import com.hotent.lpg.common.model.WDd;
11 12 import com.hotent.lpg.common.model.WHydz;
... ... @@ -156,7 +157,7 @@ public class DdConroller {
156 157 ddDto.setJd(hydz.getFJd());
157 158 ddDto.setWd(hydz.getFWd());
158 159  
159   - ddDto.setSfhy("是");
  160 + ddDto.setSfhy(SysEnum.Y.getCode());
160 161 ddDto.setHydh(hyxx.getFSjh()); //账号就是电话
161 162 ddDto.setHyid(hyxx.getFUserid());
162 163 ddDto.setHymc(hyxx.getFXm());
... ... @@ -167,8 +168,8 @@ public class DdConroller {
167 168 ddDto.setXdrlx(UserlxEnum.hy.getInfo());
168 169 ddDto.setXdrid(ContextUtil.getCurrentUserId());
169 170 ddDto.setXdrmc(ContextUtil.getCurrentUser().getFullname());
170   - ddDto.setDdly(DdlyEnum.xsxd.getInfo());
171   - ddDto.setDdzt(DdztEnum.dzf.getInfo());
  171 + ddDto.setDdly(DdlyEnum.xsxd.getCode());
  172 + ddDto.setDdzt(DdztEnum.CREATED.getCode());
172 173 WDd order = wDdManager.addOrder(ddDto);
173 174 log.warn("创建订单2：{}", order);
174 175 HashMap<String, Object> resultData = wxPayManager.generatePrepayOrder(order, ddDto.getOpenId());
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/PayTypeEnum.java
View file @7fdc17f
... ... @@ -1,11 +0,0 @@
1   -package com.hotent.lpg.user.enums;
2   -import lombok.AllArgsConstructor;
3   -import lombok.Getter;
4   -
5   -@Getter
6   -@AllArgsConstructor
7   -public enum PayTypeEnum {
8   - WX("微信");
9   -
10   - private String name;
11   -}
backend/lpg-user/src/main/java/com/hotent/lpg/user/enums/TradeTypeEnum.java
View file @7fdc17f
... ... @@ -1,15 +0,0 @@
1   -package com.hotent.lpg.user.enums;
2   -
3   -import lombok.AllArgsConstructor;
4   -import lombok.Getter;
5   -
6   -@Getter
7   -@AllArgsConstructor
8   -public enum TradeTypeEnum {
9   - APP("APP"),
10   - NATIVE("NATIVE"),
11   - JSAPI("JSAPI"),
12   - MWEB("MWEB");
13   -
14   - private String code;
15   -}
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/DdManager.java
  Diff comments   View file @1b62ea0
... ... @@ -29,7 +29,7 @@ public interface DdManager extends BaseManager&lt;WDd&gt; {
29 29 void cancel(String ddid);
30 30  
31 31  
32   - WDd createOrder(DdDto request);
  32 +// WDd createOrder(DdDto request);
33 33  
34 34  
35 35  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/DdManagerImpl.java
  Diff comments   View file @1b62ea0
... ... @@ -13,8 +13,7 @@ import com.hotent.base.id.IdGenerator;
13 13 import com.hotent.base.manager.impl.BaseManagerImpl;
14 14 import com.hotent.base.util.BeanUtils;
15 15 import com.hotent.base.util.StringUtil;
16   -import com.hotent.lpg.common.enums.DdfwlxEnum;
17   -import com.hotent.lpg.common.enums.DdztEnum;
  16 +import com.hotent.lpg.common.enums.*;
18 17 import com.hotent.lpg.common.model.WDd;
19 18 import com.hotent.lpg.common.model.WDdxq;
20 19 import com.hotent.lpg.common.model.WHyyqjl;
... ... @@ -82,95 +81,100 @@ public class DdManagerImpl extends BaseManagerImpl&lt;DdDao, WDd&gt; implements DdMana
82 81 if (ObjectUtil.isNull(dd)) {
83 82 throw new RuntimeException("参数错误:订单不存在");
84 83 }
85   - if (!(DdztEnum.dps.getInfo().equals(dd.getFDdzt()) || DdztEnum.psz.getInfo().equals(dd.getFDdzt()) || DdztEnum.dzf.getInfo().equals(dd.getFDdzt()))) {
  84 + if (!(DdztEnum.CREATED.getCode().equals(dd.getFDdzt())
  85 + || DdztEnum.PAID.getCode().equals(dd.getFDdzt())
  86 + || DdztEnum.SHIPPED.getCode().equals(dd.getFDdzt()))) {
86 87 throw new RuntimeException("订单状态不正确");
87 88 }
88   -// dd.setFDdzt(DdztEnum.yqx.getInfo());
89   -// baseMapper.updateById(dd);
90 89  
91   - if (dd.getFDdly().equals("线上下单") && dd.getFZffs().equals("微信") && dd.getFSfzf().equals("是")) {
  90 +
  91 + if (dd.getFDdly().equals(DdlyEnum.xsxd.getCode()) && dd.getFZffs().equals(DdZffsEnum.WX_PAY.getCode()) && dd.getFSfzf().equals(SysEnum.Y.getCode())) {
92 92 //线上下单+微信支付+已支付 才退款
93 93 String shtkdh = wxPayManager.initiateRefundOrder(ddid);
94   - dd.setFDdzt(DdztEnum.tkz.getInfo());
  94 + dd.setFDdzt(DdztEnum.REFUNDING.getCode());
95 95 dd.setFShtkdh(shtkdh);
96   - dd.setFSftk("否");
  96 + dd.setFSftk(SysEnum.N.getCode());
  97 + baseMapper.updateById(dd);
  98 + }else {
  99 + dd.setFDdzt(DdztEnum.REFUNDED.getCode());
  100 + dd.setFSftk(SysEnum.N.getCode());
97 101 baseMapper.updateById(dd);
98 102 }
99 103 //添加服务日志
100 104 // wDdfwrzManager.insertDdfwrz(DdfwlxEnum.qxdd.getCode(), dd.getId());
101 105 }
102 106  
103   - @Override
104   - @Transactional(rollbackFor = Exception.class)
105   - public WDd createOrder(DdDto request) {
106   - WQplx qplx = qplxDao.selectById(request.getXqList().get(0).getQplxId());
107   - WDd dd = new WDd();
108   - dd.setId(idGenerator.getSuid());
109   -
110   - dd.setFSfhy(request.getSfhy());
111   - dd.setFHyyhid(request.getHyid());
112   - dd.setFHymc(request.getHymc());
113   - dd.setFHylx(request.getHylx());
114   - dd.setFHydh(request.getHydh());
115   -
116   - dd.setFShtysbm(request.getShtysbm());
117   - dd.setFSfzh(request.getSfzh());
118   -
119   - dd.setFDdlx(null);
120   - dd.setFDddh(idGenerator.getSuid());
121   - dd.setFDdly(request.getDdly());
122   - dd.setFZffs(null);
123   - dd.setFPsfs(request.getPsfs());
124   - dd.setFDdzt(DdztEnum.dps.getInfo());
125   - dd.setFMjly(request.getMjly());
126   - dd.setFBz(request.getBz());
127   -
128   - dd.setFCzid(qplx.getfSsczid());
129   - dd.setFCzmc(qplx.getfSsczmc());
130   - dd.setFQyid(qplx.getfSsqyid());
131   -
132   - dd.setFXdrlx(request.getXdrlx());
133   - dd.setFXdrid(request.getXdrid());
134   - dd.setFXdrmc(request.getXdrmc());
135   - dd.setFShlxr(request.getShlxr());
136   - dd.setFShlxrdh(request.getShlxrdh());
137   - dd.setFShsf(request.getShsf());
138   - dd.setFShs(request.getShs());
139   - dd.setFShq(request.getShq());
140   - dd.setFShjd(request.getShjd());
141   - dd.setFShxxdz(request.getShxxdz());
142   - dd.setFCjr(ContextUtil.getCurrentUser().getFullname());
143   - dd.setFCjsj(LocalDateTime.now());
144   - dd.setFGxr(ContextUtil.getCurrentUser().getFullname());
145   - dd.setFGxsj(LocalDateTime.now());
146   - dd.setFShdzjd(request.getJd());
147   - dd.setFShdzwd(request.getWd());
148   - BigDecimal ddje = new BigDecimal(0);
149   - List<WDdxq> ddxqList = new ArrayList<WDdxq>();
150   - for (DdDto.XqVO xqVO : request.getXqList()) {
151   - WQplx wQplx = qplxDao.selectById(xqVO.getQplxId());
152   - if (ObjectUtil.isNull(wQplx)) {
153   - throw new RuntimeException("商品信息不存在");
154   - }
155   - ddje = NumberUtil.add(ddje, NumberUtil.mul(wQplx.getfJg(), xqVO.getSl()));
156   - WDdxq ddxq = new WDdxq();
157   - ddxq.setfDdid(dd.getId());
158   - ddxq.setfQplxid(wQplx.getId());
159   - ddxq.setfSpmc(wQplx.getfMc());
160   - ddxq.setfTp(wQplx.getfTp());
161   - ddxq.setfSl(BigDecimal.valueOf(xqVO.getSl()));
162   - ddxq.setfDj(wQplx.getfJg());
163   - ddxq.setfMs(wQplx.getfMs());
164   - ddxqDao.insert(ddxq);
165   - ddxqList.add(ddxq);
166   - }
167   - dd.setFDdje(ddje);
168   - dd.setDdxqList(ddxqList);
169   - baseMapper.insert(dd);
170   - //添加服务日志
171   - wDdfwrzManager.insertDdfwrz(DdfwlxEnum.cjdd.getCode(), dd.getId());
172   - return dd;
173   - }
  107 +// @Override
  108 +// @Transactional(rollbackFor = Exception.class)
  109 +// public WDd createOrder(DdDto request) {
  110 +// WQplx qplx = qplxDao.selectById(request.getXqList().get(0).getQplxId());
  111 +// WDd dd = new WDd();
  112 +// dd.setId(idGenerator.getSuid());
  113 +//
  114 +// dd.setFSfhy(request.getSfhy());
  115 +// dd.setFHyyhid(request.getHyid());
  116 +// dd.setFHymc(request.getHymc());
  117 +// dd.setFHylx(request.getHylx());
  118 +// dd.setFHydh(request.getHydh());
  119 +//
  120 +// dd.setFShtysbm(request.getShtysbm());
  121 +// dd.setFSfzh(request.getSfzh());
  122 +//
  123 +// dd.setFDdlx(null);
  124 +// dd.setFDddh(idGenerator.getSuid());
  125 +// dd.setFDdly(request.getDdly());
  126 +// dd.setFZffs(null);
  127 +// dd.setFPsfs(request.getPsfs());
  128 +// dd.setFDdzt(DdztEnum.PAID.getCode());
  129 +// dd.setFMjly(request.getMjly());
  130 +// dd.setFBz(request.getBz());
  131 +//
  132 +// dd.setFCzid(qplx.getfSsczid());
  133 +// dd.setFCzmc(qplx.getfSsczmc());
  134 +// dd.setFQyid(qplx.getfSsqyid());
  135 +//
  136 +// dd.setFXdrlx(request.getXdrlx());
  137 +// dd.setFXdrid(request.getXdrid());
  138 +// dd.setFXdrmc(request.getXdrmc());
  139 +// dd.setFShlxr(request.getShlxr());
  140 +// dd.setFShlxrdh(request.getShlxrdh());
  141 +// dd.setFShsf(request.getShsf());
  142 +// dd.setFShs(request.getShs());
  143 +// dd.setFShq(request.getShq());
  144 +// dd.setFShjd(request.getShjd());
  145 +// dd.setFShxxdz(request.getShxxdz());
  146 +// dd.setFCjr(ContextUtil.getCurrentUser().getFullname());
  147 +// dd.setFCjsj(LocalDateTime.now());
  148 +// dd.setFGxr(ContextUtil.getCurrentUser().getFullname());
  149 +// dd.setFGxsj(LocalDateTime.now());
  150 +// dd.setFShdzjd(request.getJd());
  151 +// dd.setFShdzwd(request.getWd());
  152 +// BigDecimal ddje = new BigDecimal(0);
  153 +// List<WDdxq> ddxqList = new ArrayList<WDdxq>();
  154 +// for (DdDto.XqVO xqVO : request.getXqList()) {
  155 +// WQplx wQplx = qplxDao.selectById(xqVO.getQplxId());
  156 +// if (ObjectUtil.isNull(wQplx)) {
  157 +// throw new RuntimeException("商品信息不存在");
  158 +// }
  159 +// ddje = NumberUtil.add(ddje, NumberUtil.mul(wQplx.getfJg(), xqVO.getSl()));
  160 +// WDdxq ddxq = new WDdxq();
  161 +// ddxq.setfDdid(dd.getId());
  162 +// ddxq.setfQplxid(wQplx.getId());
  163 +// ddxq.setfSpmc(wQplx.getfMc());
  164 +// ddxq.setfTp(wQplx.getfTp());
  165 +// ddxq.setfSl(BigDecimal.valueOf(xqVO.getSl()));
  166 +// ddxq.setfDj(wQplx.getfJg());
  167 +// ddxq.setfMs(wQplx.getfMs());
  168 +// ddxqDao.insert(ddxq);
  169 +// ddxqList.add(ddxq);
  170 +// }
  171 +// dd.setFDdje(ddje);
  172 +// dd.setDdxqList(ddxqList);
  173 +// baseMapper.insert(dd);
  174 +// //添加服务日志
  175 +// wDdfwrzManager.insertDdfwrz(DdfwlxEnum.cjdd.getCode(), dd.getId());
  176 +// return dd;
  177 +// }
174 178  
175 179 @Override
176 180 public IPage pageList(Page page, String zt, String hyid) {
... ... @@ -226,9 +230,9 @@ public class DdManagerImpl extends BaseManagerImpl&lt;DdDao, WDd&gt; implements DdMana
226 230 dd.setFDdly(ddDto.getDdly());
227 231 dd.setFZffs(ddDto.getZffs());
228 232 dd.setFZflx(ddDto.getZflx());
229   - dd.setFSfzf("否");
  233 + dd.setFSfzf(SysEnum.N.getCode());
230 234 dd.setFPsfs(ddDto.getPsfs());
231   - dd.setFDdzt(StringUtil.isEmail(ddDto.getDdzt()) ? DdztEnum.dps.getInfo() : ddDto.getDdzt());
  235 + dd.setFDdzt(StringUtil.isEmail(ddDto.getDdzt()) ? DdztEnum.PAID.getCode() : ddDto.getDdzt());
232 236 dd.setFMjly(ddDto.getMjly());
233 237 dd.setFBz(ddDto.getBz());
234 238 dd.setFCzid(qplx.getfSsczid());
... ... @@ -273,7 +277,7 @@ public class DdManagerImpl extends BaseManagerImpl&lt;DdDao, WDd&gt; implements DdMana
273 277 dd.setDdxqList(ddxqList);
274 278 baseMapper.insert(dd);
275 279 //添加服务日志
276   - wDdfwrzManager.insertDdfwrz(DdfwlxEnum.cjdd.getCode(), dd.getId());
  280 +// wDdfwrzManager.insertDdfwrz(DdfwlxEnum.cjdd.getCode(), dd.getId());
277 281 return dd;
278 282 }
279 283 }
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WxPayManagerImpl.java
  Diff comments   View file @1b62ea0
... ... @@ -13,7 +13,10 @@ import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
13 13 import com.github.binarywang.wxpay.exception.WxPayException;
14 14 import com.github.binarywang.wxpay.service.WxPayService;
15 15 import com.hotent.base.util.BeanUtils;
  16 +import com.hotent.lpg.common.enums.DdZffsEnum;
  17 +import com.hotent.lpg.common.enums.DdlyEnum;
16 18 import com.hotent.lpg.common.enums.DdztEnum;
  19 +import com.hotent.lpg.common.enums.SysEnum;
17 20 import com.hotent.lpg.common.model.WCzzfpz;
18 21 import com.hotent.lpg.common.model.WDd;
19 22 import com.hotent.lpg.user.dao.CzzfpzDao;
... ... @@ -63,10 +66,10 @@ public class WxPayManagerImpl implements WxPayManager {
63 66 public String initiateRefundOrder(String ddid) {
64 67 // 1. 查询订单信息
65 68 WDd wDd = ddDao.selectById(ddid);
66   - if (!DdztEnum.dps.getInfo().equals(wDd.getFDdzt())) {
  69 + if (!DdztEnum.REFUNDING.getCode().equals(wDd.getFDdzt())) {
67 70 throw new RuntimeException("订单状态不正确");
68 71 }
69   - if (!(wDd.getFDdly().equals("线上下单") && wDd.getFZffs().equals("微信") && wDd.getFSfzf().equals("是"))) {
  72 + if (wDd.getFDdly().equals(DdlyEnum.xsxd.getCode()) && wDd.getFZffs().equals(DdZffsEnum.WX_PAY.getCode()) && wDd.getFSfzf().equals(SysEnum.Y.getCode())) {
70 73 throw new RuntimeException("订单状态不正确");
71 74 }
72 75 // 2. 获取支付配置
... ... @@ -130,12 +133,12 @@ public class WxPayManagerImpl implements WxPayManager {
130 133 if (wDd == null) {
131 134 return generateXmlResponse("FAIL", "未查询到订单", outTradeNo);
132 135 }
133   - if (wDd.getFSftk().equals("是")){
  136 + if (wDd.getFSftk().equals(SysEnum.Y.getCode())){
134 137 return generateXmlResponse("FAIL", "订单已退款", outTradeNo);
135 138 }
136 139 // 5. 更新订单状态
137   - wDd.setFDdzt(DdztEnum.yqx.getInfo());
138   - wDd.setFSftk("是");
  140 + wDd.setFDdzt(DdztEnum.REFUNDED.getCode());
  141 + wDd.setFSftk(SysEnum.Y.getCode());
139 142 wDd.setFTkdh(refundId);
140 143 wDd.setFTksj(LocalDateTimeUtils.parse(successTime));
141 144 ddDao.updateById(wDd);
... ... @@ -179,7 +182,7 @@ public class WxPayManagerImpl implements WxPayManager {
179 182 return generateXmlResponse("FAIL", "订单不存在", dddh);
180 183 }
181 184 // 检查订单状态是否已支付
182   - if ("已支付".equals(wDd.getFDdzt())) {
  185 + if (SysEnum.Y.getCode().equals(wDd.getFDdzt())) {
183 186 log.warn("订单 {} 已经处理过，忽略本次通知", dddh);
184 187 return generateXmlResponse("SUCCESS", "已处理过", dddh);
185 188 }
... ... @@ -192,8 +195,8 @@ public class WxPayManagerImpl implements WxPayManager {
192 195 String timeEnd = notifyResult.getTimeEnd();
193 196 LocalDateTime paymentTime = LocalDateTimeUtils.parse(timeEnd);
194 197 wDd.setFFksj(paymentTime);
195   - wDd.setFSfzf("是");
196   - wDd.setFDdzt("待配送");
  198 + wDd.setFSfzf(SysEnum.Y.getCode());
  199 + wDd.setFDdzt(DdztEnum.PAID.getCode());
197 200 wDd.setFZfdh(transactionId);
198 201 ddDao.updateById(wDd);
199 202  
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/YgxxManagerImpl.java
  Diff comments   View file @1b62ea0
... ... @@ -75,7 +75,7 @@ public class YgxxManagerImpl extends BaseManagerImpl&lt;YgxxDao, WYgxx&gt; implements
75 75 }
76 76 QueryWrapper<WDd> queryWrapperWDd = new QueryWrapper<>();
77 77 queryWrapperWDd.select("id_");
78   - queryWrapperWDd.eq("F_psrID", wYgxx.getId()).eq("F_ddzt", DdztEnum.ywc.getInfo());
  78 + queryWrapperWDd.eq("F_psrID", wYgxx.getId()).eq("F_ddzt", DdztEnum.COMPLETED.getCode());
79 79 List<WDd> wDdList = ddManager.list(queryWrapperWDd);
80 80 if (ObjectUtils.isNotEmpty(wDdList)) {
81 81 scanCodeYgxxVO.setLjpsdd(wDdList.size() + "");
... ...
backend/lpg-user/src/main/java/com/hotent/lpg/user/util/WxPayConfiguration.java
  Diff comments   View file @1b62ea0
... ... @@ -8,7 +8,7 @@ import com.hotent.lpg.common.model.WCzzfpz;
8 8 public class WxPayConfiguration {
9 9  
10 10  
11   - public static final String hostUrl = "http://qyhtiz.natappfree.cc/api";
  11 + public static final String hostUrl = "http://m8wgk2.natappfree.cc";
12 12 public static WxPayService getPayService(WCzzfpz wCzzfpz) {
13 13 WxPayConfig wxPayConfig = new WxPayConfig();
14 14 wxPayConfig.setAppId(wCzzfpz.getFAppid()); // appId（应用id）（微信支付商户平台获取）
... ...
backend/lpg/src/main/java/com/hotent/lpg/controller/WDdController.java
  Diff comments   View file @1b62ea0
... ... @@ -85,10 +85,10 @@ public class WDdController extends BaseController&lt;WDdManager, WDd&gt; {
85 85 if (wdd == null) {
86 86 return new CommonResult(false, "订单信息不存在");
87 87 }
88   - if (DdztEnum.ywc.getInfo().equals(wdd.getFDdzt())) {
  88 + if (DdztEnum.COMPLETED.getCode().equals(wdd.getFDdzt())) {
89 89 return new CommonResult(false, "订单已完成，不可再次操作");
90 90 }
91   - if (DdztEnum.yqx.getInfo().equals(wdd.getFDdzt())) {
  91 + if (DdztEnum.REFUNDED.getCode().equals(wdd.getFDdzt())) {
92 92 return new CommonResult(false, "订单已取消，不可再次操作");
93 93 }
94 94 //获取当前员工在uc_user表中的信息
... ...
backend/lpg/src/main/java/com/hotent/lpg/controller/yg/WStaffOrderController.java
  Diff comments   View file @1b62ea0
... ... @@ -67,10 +67,10 @@ public class WStaffOrderController {
67 67 if (wdd == null) {
68 68 return new CommonResult(false, "订单信息不存在");
69 69 }
70   - if (DdztEnum.ywc.getInfo().equals(wdd.getFDdzt())) {
  70 + if (DdztEnum.COMPLETED.getCode().equals(wdd.getFDdzt())) {
71 71 return new CommonResult(false, "订单已完成，不可再次操作");
72 72 }
73   - if (DdztEnum.yqx.getInfo().equals(wdd.getFDdzt())) {
  73 + if (DdztEnum.REFUNDED.getCode().equals(wdd.getFDdzt())) {
74 74 return new CommonResult(false, "订单已取消，不可再次操作");
75 75 }
76 76 //获取当前员工在uc_user表中的信息
... ...
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WDdManagerImpl.java
  Diff comments   View file @1b62ea0
... ... @@ -132,7 +132,7 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
132 132 dd.setFDdly(request.getDdly());
133 133 dd.setFZffs(null);
134 134 dd.setFPsfs(request.getPsfs());
135   - dd.setFDdzt(DdztEnum.dps.getInfo());
  135 + dd.setFDdzt(DdztEnum.PAID.getCode());
136 136 dd.setFMjly(request.getMjly());
137 137 dd.setFBz(request.getBz());
138 138  
... ... @@ -189,8 +189,8 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
189 189 if (ObjectUtil.isNull(dd)) {
190 190 throw new RuntimeException("参数错误:订单不存在");
191 191 }
192   - if (DdztEnum.dps.getInfo().equals(dd.getFDdzt()) || DdztEnum.psz.getInfo().equals(dd.getFDdzt())) {
193   - dd.setFDdzt(DdztEnum.yqx.getInfo());
  192 + if (DdztEnum.PAID.getCode().equals(dd.getFDdzt()) || DdztEnum.SHIPPED.getCode().equals(dd.getFDdzt())) {
  193 + dd.setFDdzt(DdztEnum.REFUNDED.getCode());
194 194 ddDao.updateById(dd);
195 195 } else {
196 196 throw new RuntimeException("订单状态不正确");
... ... @@ -267,7 +267,7 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
267 267 //订单数据
268 268 wDd.setFPsrid(wYgxx.getId());//配送人id
269 269 wDd.setFPsfs(DdpsfsEnum.ps.getInfo());//配送方式
270   - wDd.setFDdzt(DdztEnum.ywc.getInfo());//订单状态
  270 + wDd.setFDdzt(DdztEnum.COMPLETED.getCode());//订单状态
271 271 wDd.setFBz(khxx.getBz());//备注
272 272 wDd.setFSjwcsj(now_string);//实际完成时间
273 273 wDd.setFGxr(wYgxx.getFXm());//更新人
... ... @@ -588,7 +588,7 @@ public class WDdManagerImpl extends BaseManagerImpl&lt;WDdDao, WDd&gt; implements WDdM
588 588 wHyyqjlManager.updateWhyyqjlList(wQpssxxList_kphs, wYgxx, now_string, now);
589 589 wHyyqjlManager.updateWhyyqjlList(wQpssxxList_mphs, wYgxx, now_string, now);
590 590  
591   - wdd.setFDdzt(DdztEnum.ywc.getInfo());
  591 + wdd.setFDdzt(DdztEnum.COMPLETED.getCode());
592 592 wdd.setFSjwcsj(now_string);
593 593 wdd.setFGxr(wYgxx.getFXm());
594 594 wdd.setFGxsj(now);
... ...
backend/lpg/src/main/resources/mapper/WDdMapper.xml
  Diff comments   View file @1b62ea0
... ... @@ -190,7 +190,7 @@
190 190 count(w_dd.F_ddly) number,
191 191 date_format(w_dd.F_sjwcsj,'%H') as dateStr
192 192 from w_dd w_dd
193   - where w_dd.F_ddzt = '已完成'
  193 + where w_dd.F_ddzt = '204'
194 194 and date_format(w_dd.F_sjwcsj,'%Y%m%d') = date_format(sysdate() ,'%Y%m%d')
195 195 and w_dd.ID_ in (select F_ddID from w_ddpsxq wd)
196 196 <if test="qyId != null and qyId != ''">
... ... @@ -234,7 +234,7 @@
234 234 count(w_dd.F_ddly) number,
235 235 date_format(w_dd.F_sjwcsj,'%Y%m%d') as dateStr
236 236 from w_dd w_dd
237   - where w_dd.F_ddzt = '已完成'
  237 + where w_dd.F_ddzt = '204'
238 238 and week(w_dd.F_sjwcsj) = week(sysdate())
239 239 and w_dd.ID_ in (select F_ddID from w_ddpsxq wd)
240 240 <if test="qyId != null and qyId != ''">
... ... @@ -278,7 +278,7 @@
278 278 count(w_dd.F_ddly) number,
279 279 date_format(w_dd.F_sjwcsj,'%Y%m%d') as dateStr
280 280 from w_dd w_dd
281   - where w_dd.F_ddzt = '已完成'
  281 + where w_dd.F_ddzt = '204'
282 282 and month(w_dd.F_sjwcsj) = month(sysdate())
283 283 and w_dd.ID_ in (select F_ddID from w_ddpsxq wd)
284 284 <if test="qyId != null and qyId != ''">
... ... @@ -316,7 +316,7 @@
316 316 count(w_dd.F_ddly) number,
317 317 month(w_dd.F_sjwcsj) as dateStr
318 318 from w_dd w_dd
319   - where w_dd.F_ddzt = '已完成'
  319 + where w_dd.F_ddzt = '204'
320 320 and year(w_dd.F_sjwcsj) = year(sysdate())
321 321 and w_dd.ID_ in (select F_ddID from w_ddpsxq wd)
322 322 <if test="qyId != null and qyId != ''">
... ... @@ -356,7 +356,7 @@
356 356 from w_dd w_dd
357 357 inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_
358 358 inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID
359   - where w_dd.F_ddzt = '已完成'
  359 + where w_dd.F_ddzt = '204'
360 360 and date_format(w_dd.F_sjwcsj,'%Y%m%d') = date_format(sysdate() ,'%Y%m%d')
361 361 <if test="qyId != null and qyId != ''">
362 362 and w_dd.F_qyID = #{qyId}
... ... @@ -397,7 +397,7 @@
397 397 from w_dd w_dd
398 398 inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_
399 399 inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID
400   - where w_dd.F_ddzt = '已完成'
  400 + where w_dd.F_ddzt = '204'
401 401 and week(w_dd.F_sjwcsj) = week(sysdate())
402 402 <if test="qyId != null and qyId != ''">
403 403 and w_dd.F_qyID = #{qyId}
... ... @@ -438,7 +438,7 @@
438 438 from w_dd w_dd
439 439 inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_
440 440 inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID
441   - where w_dd.F_ddzt = '已完成'
  441 + where w_dd.F_ddzt = '204'
442 442 and month(w_dd.F_sjwcsj) = month(sysdate())
443 443 <if test="qyId != null and qyId != ''">
444 444 and w_dd.F_qyID = #{qyId}
... ... @@ -473,7 +473,7 @@
473 473 from w_dd w_dd
474 474 inner join w_ddpsxq w_ddpsxq on w_ddpsxq.F_ddID = w_dd.ID_
475 475 inner join w_qpxx w_qpxx on w_qpxx.ID_ = w_ddpsxq.F_qpID
476   - where w_dd.F_ddzt = '已完成'
  476 + where w_dd.F_ddzt = '204'
477 477 and year(w_dd.F_sjwcsj) = year(sysdate())
478 478 <if test="qyId != null and qyId != ''">
479 479 and w_dd.F_qyID = #{qyId}
... ... @@ -515,14 +515,14 @@
515 515 select * from w_dd w_dd
516 516 <where>
517 517 <if test="query.fDdzt != null and query.fDdzt != ''">
518   - <if test="query.fDdzt == '待配送/自提'.toString()">
519   - and w_dd.F_ddzt in ('待配送','自提')
  518 + <if test="query.fDdzt == '202'.toString()">
  519 + and w_dd.F_ddzt in ('202','自提')
520 520 </if>
521   - <if test="query.fDdzt == '配送中'.toString()">
522   - and w_dd.F_ddzt = '配送中'
  521 + <if test="query.fDdzt == '203'.toString()">
  522 + and w_dd.F_ddzt = '203'
523 523 </if>
524   - <if test="query.fDdzt == '已完成'.toString()">
525   - and w_dd.F_ddzt = '已完成'
  524 + <if test="query.fDdzt == '204'.toString()">
  525 + and w_dd.F_ddzt = '204'
526 526 </if>
527 527 </if>
528 528 <if test="query.fDddh != null and query.fDddh != ''">
... ...