From 0544913da2cca58f690f5f12966c214ff08eda7e Mon Sep 17 00:00:00 2001 From: rk <94314517@qq.com> Date: 星期一, 15 九月 2025 13:57:45 +0800 Subject: [PATCH] 111 --- server/services/src/main/java/com/doumee/dao/business/MemberMapper.java | 4 server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java | 2 server/web/src/main/java/com/doumee/api/web/OrdersApi.java | 1 server/services/src/main/java/com/doumee/core/constants/Constants.java | 55 ++++++- server/admin/src/main/java/com/doumee/job/AutoCancelOrdersJob.java | 34 ++++ server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 18 ++ server/services/src/main/java/com/doumee/service/business/OrdersService.java | 2 server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java | 6 server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 227 ++++++++++++++++++++----------- server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java | 52 +++++- server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java | 14 ++ 11 files changed, 304 insertions(+), 111 deletions(-) diff --git a/server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java b/server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java index a1b873b..1c2656f 100644 --- a/server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java +++ b/server/admin/src/main/java/com/doumee/api/business/PaymentCallback.java @@ -1,6 +1,7 @@ package com.doumee.api.business; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.doumee.config.wx.TransferDetailEntityNew; import com.doumee.config.wx.WxMiniConfig; import com.doumee.core.constants.Constants; @@ -59,6 +60,7 @@ */ @PostMapping("/web/wxPayNotify") public ApiResponse wxPay_notify(HttpServletRequest request) { + log.error("寰俊鏀粯鍥炶皟缁撴灉寮�濮�===========" ); try { ServletInputStream inputStream = request.getInputStream(); StringBuffer stringBuffer = new StringBuffer(); @@ -97,6 +99,7 @@ Transaction result = parser.parse(requestParam, Transaction.class); + log.error("鏀粯鍥炶皟淇℃伅锛歿}"+ JSONObject.toJSONString(result)); //鑷畾涔夎鍗曞彿 String outTradeNo = result.getOutTradeNo(); //寰俊璁㈠崟鍙� @@ -113,11 +116,12 @@ } else { // 鏀粯澶辫触 switch (result.getAttach()) { - case "createGoodsOrder": { + case "createOrder": { break; } } } + log.error("寰俊鏀粯鍥炶皟缁撴灉缁撴潫===========" ); return ApiResponse.success("澶勭悊鎴愬姛!"); } catch (Exception e) { e.printStackTrace(); diff --git a/server/admin/src/main/java/com/doumee/job/AutoCancelOrdersJob.java b/server/admin/src/main/java/com/doumee/job/AutoCancelOrdersJob.java new file mode 100644 index 0000000..39b366f --- /dev/null +++ b/server/admin/src/main/java/com/doumee/job/AutoCancelOrdersJob.java @@ -0,0 +1,34 @@ +package com.doumee.job; + +import com.doumee.core.job.BaseJob; +import com.doumee.core.job.JobContext; +import com.doumee.core.job.JobParam; +import com.doumee.service.business.OrdersService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 鑷姩鍙栨秷鏈敮浠樿鍗� + * @author dm + * @since 2025/03/31 16:44 + */ +@Slf4j +@Component("AutoCancelOrdersJob") +public class AutoCancelOrdersJob extends BaseJob { + + @Autowired + private OrdersService ordersService; + + @Override + public JobContext execute(JobParam param) { + JobContext jobContext = new JobContext(); + try { + ordersService.autoCancelWaitPay(); + jobContext.setContext("鑷姩鍙栨秷鏈敮浠樿鍗�"); + } catch (Exception e) { + e.printStackTrace(); + } + return jobContext; + } +} diff --git a/server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java b/server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java index 59ece1c..59c76b0 100644 --- a/server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java +++ b/server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java @@ -56,7 +56,7 @@ */ public void identityInfoMessage(String openid, IdentityInfo identityInfo){ try{ - RestTemplate restTemplate = new RestTemplate(); + String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁よ瘉淇℃伅 -> accessToken锛歿}",accessToken); //杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆¢兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級 @@ -66,12 +66,11 @@ //鐢ㄦ埛鐨刼penid锛堣鍙戦�佺粰閭d釜鐢ㄦ埛锛� wxMsgVO.setTouser(openid); //璁㈤槄娑堟伅妯℃澘id - wxMsgVO.setTemplate_id("VJho7-lf-4_WZFfOzenDndgwNDIA0EvCiE6vqBnExpQ"); + wxMsgVO.setTemplate_id("VJho7-lf-4_WZFfOzenDnX6sOhYBJWwkLExVjBB563U"); Map<String, TemplateData> m = new HashMap<>(4); - m.put("thing2", new TemplateData(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO)?"瀹炲悕璁よ瘉":Constants.equalsInteger(identityInfo.getType(),Constants.ONE)?"杩愯揣璁よ瘉":"渚涢璁よ瘉")); + m.put("thing2", new TemplateData(Constants.equalsInteger(identityInfo.getType(),Constants.ZERO)?"鐢ㄥ伐璁よ瘉":Constants.equalsInteger(identityInfo.getType(),Constants.ONE)?"杩愯揣璁よ瘉":"渚涢璁よ瘉")); m.put("phrase6", new TemplateData(Constants.equalsInteger(identityInfo.getAuditStatus(),Constants.TWO)?"閫氳繃":"鏈�氳繃")); m.put("time12", new TemplateData(DateUtil.formatDate(identityInfo.getAuditTime(),"yyyy-MM-dd HH:mm"))); - m.put("thing14", new TemplateData(identityInfo.getAuditRemark())); wxMsgVO.setPage(mineUrl); wxMsgVO.setData(m); log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁よ瘉淇℃伅锛歿}", JSONObject.toJSONString(wxMsgVO)); @@ -94,7 +93,7 @@ * @throws WxErrorException */ public void cancelMessage(List<String> openidList, Orders orders,Integer cancelType ){ - RestTemplate restTemplate = new RestTemplate(); + try{ String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鍙栨秷涓氬姟 -> accessToken锛歿}",accessToken); @@ -109,7 +108,7 @@ m.put("character_string3", new TemplateData(orders.getCode())); m.put("thing2", new TemplateData(Constants.orderType.getName(orders.getType()))); m.put("thing1", new TemplateData(orders.getLocation() + (StringUtils.isNotBlank(orders.getLocationRemark())?orders.getLocationRemark():""))); - m.put("date8", new TemplateData(DateUtil.getFomartDate(orders.getCancelTime(),"yyyy-MM-dd HH:mm:ss"))); + m.put("date8", new TemplateData(DateUtil.formatDate(orders.getCancelTime(),"yyyy-MM-dd HH:mm:ss"))); m.put("thing6", new TemplateData(Constants.equalsInteger(cancelType,Constants.ZERO)?"骞冲彴鍙栨秷":Constants.equalsInteger(cancelType,Constants.ONE)?"鍙戝崟鏂瑰彇娑�":"鎺ュ崟鏂瑰彇娑�")); String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight: Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail; @@ -145,7 +144,7 @@ * @throws WxErrorException */ public void acceptMessage(String openid, Orders orders,String memberName,String memberPhone){ - RestTemplate restTemplate = new RestTemplate(); + try{ String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鎺ュ崟涓氬姟 -> accessToken锛歿}",accessToken); @@ -180,7 +179,7 @@ public void orderUpdMessage(String openid, Orders orders){ - RestTemplate restTemplate = new RestTemplate(); + try{ String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鍙樻洿閫氱煡 -> accessToken锛歿}",accessToken); @@ -218,7 +217,7 @@ public void withdrawalMessage(String openid, WithdrawalOrders withdrawalOrders){ try{ - RestTemplate restTemplate = new RestTemplate(); + String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鎻愮幇鎴愬姛閫氱煡 -> accessToken锛歿}",accessToken); //杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆¢兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級 @@ -249,7 +248,7 @@ public void revenueMessage(String openid, Orders orders){ try{ - RestTemplate restTemplate = new RestTemplate(); + String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鏀剁泭閫氱煡 -> accessToken锛歿}",accessToken); //杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆¢兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級 @@ -281,7 +280,7 @@ public void autoDispatchMessage(String openid, Orders orders,double distance){ try{ - RestTemplate restTemplate = new RestTemplate(); + String accessToken = WxMiniConfig.wxMaService.getAccessToken(); log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鏈嶅姟娲惧崟 -> accessToken锛歿}",accessToken); //杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆¢兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級 @@ -296,7 +295,7 @@ m.put("thing3", new TemplateData(orders.getOrderContent())); m.put("phrase4", new TemplateData("姝ゅ湴璺濈鎮�"+distance+"鍏噷")); m.put("amount28", new TemplateData(orders.getEstimatedAccount().toString())); - m.put("thing12", new TemplateData("宸ュ崟灏嗕簬"+DateUtil.getFomartDate(orders.getStartDate(),"MM-dd")+"寮�濮�")); + m.put("thing12", new TemplateData("宸ュ崟灏嗕簬"+DateUtil.formatDate(orders.getStartDate(),"MM-dd")+"寮�濮�")); String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight: Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail; pageUrl = pageUrl.replace("{id}",orders.getId().toString()); @@ -311,8 +310,35 @@ }catch (WxErrorException wxErrorException){ } - } + public void waitPayMessage(String openid, Orders orders){ + try{ + String accessToken = WxMiniConfig.wxMaService.getAccessToken(); + log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟閲戦纭寰呮敮浠� -> accessToken锛歿}",accessToken); + //杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆¢兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級 + String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken; + //鎷兼帴鎺ㄩ�佺殑妯$増 + WxMsgVO wxMsgVO = new WxMsgVO(); + wxMsgVO.setTouser(openid); + //璁㈤槄娑堟伅妯℃澘id + wxMsgVO.setTemplate_id("3rOz7DAnawrkKDM8b5_XW4FLivISWYov6d7QSC4ORsg"); + Map<String, TemplateData> m = new HashMap<>(5); + m.put("character_string1", new TemplateData(orders.getCode())); + m.put("thing7", new TemplateData( Constants.getOrderInfo(orders))); + m.put("amount14", new TemplateData(new BigDecimal(orders.getPayAccount().toString()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP).toString())); + String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight: + Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail; + pageUrl = pageUrl.replace("{id}",orders.getId().toString()); + wxMsgVO.setPage(pageUrl); + wxMsgVO.setData(m); + log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟閲戦纭寰呮敮浠橈細{}", JSONObject.toJSONString(wxMsgVO)); + //鐢ㄦ埛鐨刼penid锛堣鍙戦�佺粰閭d釜鐢ㄦ埛锛� + String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO)); + log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟閲戦纭寰呮敮浠橈細{}", JSONObject.toJSONString(responseEntity)); + }catch (WxErrorException wxErrorException){ + + } + } } diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java index cb06d9a..49726e0 100644 --- a/server/services/src/main/java/com/doumee/core/constants/Constants.java +++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java @@ -1,5 +1,6 @@ package com.doumee.core.constants; +import com.doumee.dao.business.model.Orders; import lombok.AllArgsConstructor; import lombok.Getter; @@ -56,6 +57,7 @@ public static final String AUTO_DISPATCH ="AUTO_DISPATCH" ; public static final String AUTO_DISPATCH_DISTANCE ="AUTO_DISPATCH_DISTANCE" ; public static final String AUTO_CONFIRM ="AUTO_CONFIRM" ; + public static final String AUTO_CANCEL_WAIT_PAY ="AUTO_CANCEL_WAIT_PAY" ; public static final String QYWX = "QYWX"; public static final Integer ONE = 1; @@ -561,22 +563,23 @@ public enum ordersStatus { - waitPay(0, "寰呮敮浠�"), - wait(1, "寰呮帴鍗�"), - accept(2, "宸叉帴鍗�"), - doing(3, "杩涜涓�"), - done(4, "宸插畬鎴�"), - feeconfirm(5, "宸茬‘璁よ垂鐢�"), - cancel(99, "宸插彇娑�"), + waitPay(0, "寰呮敮浠�","寰呮敮浠�"), + wait(1, "寰呮帴鍗�","寰呮帴鍗�"), + accept(2, "宸叉帴鍗�","宸叉帴鍗�"), + doing(3, "杩涜涓�","杩涜涓�"), + done(4, "宸插畬鎴�","宸插畬鎴�"), + feeconfirm(5, "寰呮敮浠�","寰呭彂鍗曟柟鏀粯"),//閲戦宸茬‘璁� + cancel(99, "宸插彇娑�","宸插彇娑�"), ; // 鎴愬憳鍙橀噺 private int key; - private String name; - + private String name; //鎺ュ崟鏂规枃妗� + private String info; //鍙戝崟鏂规枃妗� // 鏋勯�犳柟娉� - ordersStatus(int key, String name) { + ordersStatus(int key, String name,String info) { this.name = name; this.key = key; + this.info = info; } // 鏅�氭柟娉� @@ -584,6 +587,15 @@ for (ordersStatus c : ordersStatus.values()) { if (c.getKey() == index) { return c.name; + } + } + return null; + } + + public static String getInfo(int index) { + for (ordersStatus c : ordersStatus.values()) { + if (c.getKey() == index) { + return c.info; } } return null; @@ -603,6 +615,14 @@ public void setKey(int key) { this.key = key; + } + + public String getInfo() { + return info; + } + + public void setInfo(String info) { + this.info = info; } } @@ -717,6 +737,21 @@ } + public static String getOrderInfo(Orders orders){ + String orderTypeInfo = "鐢ㄥ伐鍗�"; + if(!Constants.equalsInteger(orders.getType(),Constants.ZERO)){ + orderTypeInfo = Constants.equalsInteger(orders.getType(),Constants.ONE)?"鐢ㄨ溅鍗�":"閫侀鍗�"; + }else{ + if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){ + orderTypeInfo = orderTypeInfo + "-閲囨憳宸�"; + }else{ + orderTypeInfo = orderTypeInfo + (Constants.equalsInteger(orders.getWorkType(),Constants.ONE)?"-鍒嗘嫞宸�":"-鍖呰宸�"); + } + } + return orderTypeInfo; + + } + } diff --git a/server/services/src/main/java/com/doumee/dao/business/MemberMapper.java b/server/services/src/main/java/com/doumee/dao/business/MemberMapper.java index 11e2e15..afb2f5b 100644 --- a/server/services/src/main/java/com/doumee/dao/business/MemberMapper.java +++ b/server/services/src/main/java/com/doumee/dao/business/MemberMapper.java @@ -22,8 +22,8 @@ " where id in ( " + " select ii.member_id from identity_info ii where ii.AUDIT_STATUS = 2 and type = #{orderType} " + " and ( CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( #{lgt}, #{lat} )) /1000,DECIMAL(15,2))) < 100 " + - " )" + + " ) and RELEASE_MEMBER_ID != #{releaseMemberId} " + " order by level , score desc , distance asc ") - List<Member> getList(@Param("lgt") BigDecimal lgt, @Param("lat") BigDecimal lat, @Param("orderType") Integer orderType); + List<Member> getList(@Param("lgt") BigDecimal lgt, @Param("lat") BigDecimal lat, @Param("orderType") Integer orderType, @Param("releaseMemberId") Integer releaseMemberId); } diff --git a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java index f8f5a40..5725919 100644 --- a/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java +++ b/server/services/src/main/java/com/doumee/dao/business/model/IdentityInfo.java @@ -31,10 +31,10 @@ private Integer deleted; @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1") - @ExcelColumn(name="鐢宠鏃堕棿",index = 10,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16) private Integer createUser; @ApiModelProperty(value = "鍒涘缓鏃堕棿") + @ExcelColumn(name="鐢宠鏃堕棿",index = 10,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16) private Date createTime; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java index 206604b..d0d91e4 100644 --- a/server/services/src/main/java/com/doumee/dao/business/model/Orders.java +++ b/server/services/src/main/java/com/doumee/dao/business/model/Orders.java @@ -153,8 +153,8 @@ @ExcelColumn(name = "璁㈠崟缂栧彿",index = 1,width = 10) private String code; - @ApiModelProperty(value = "璁㈠崟鐘舵��:0=寰呮敮浠� 1=寰呮帴鍗曪紱2=宸叉帴鍗曪紱3=杩涜涓紱4=宸插畬鎴愶紱99=宸插彇娑堬紱", example = "1") - @ExcelColumn(name = "璁㈠崟鐘舵��",index = 11,width = 10,valueMapping = "0=寰呮敮浠�;1=寰呮帴鍗�;2=宸叉帴鍗�;3=杩涜涓�;4=宸插畬鎴�;99=宸插彇娑�;") + @ApiModelProperty(value = "璁㈠崟鐘舵��:0=寰呮敮浠� 1=寰呮帴鍗曪紱2=宸叉帴鍗曪紱3=杩涜涓紱4=宸插畬鎴愶紱5=宸茬‘璁ら噾棰濓紱99=宸插彇娑堬紱", example = "1") + @ExcelColumn(name = "璁㈠崟鐘舵��",index = 11,width = 10,valueMapping = "0=寰呮敮浠�;1=寰呮帴鍗�;2=宸叉帴鍗�;3=杩涜涓�;4=宸插畬鎴�;5=寰呮敮浠�;99=宸插彇娑�;") private Integer status; @ApiModelProperty(value = "鏀粯鐘舵��:0=寰呮敮浠� 1=宸叉敮浠�", example = "1") @@ -236,6 +236,9 @@ @ApiModelProperty(value = "涓夋柟鏀粯璁㈠崟鍙�", example = "1") private String outTradeNo; + @ApiModelProperty(value = "鎺ュ崟鏂圭‘璁ら噾棰濇椂闂�") + private Date confirmFeeTime; + @ApiModelProperty(value = "鍥剧墖") @TableField(exist = false) private List<Multifile> multifileList; @@ -269,6 +272,12 @@ @Schema(description ="淇敼纭鍊掕鏃�") @TableField(exist = false) private Long confirmCountdown; + + + @Schema(description ="鑷姩鍙栨秷鍊掕鏃�") + @TableField(exist = false) + private Long cancelCountdown; + @ApiModelProperty(value = "闇�姹傜被鍨�") @TableField(exist = false) @@ -384,5 +393,10 @@ @TableField(exist = false) private Integer cancelStatus; + + @ApiModelProperty(value = "鏄惁鍙紑濮嬶細0=涓嶅彲浠ワ紱1=鍙互", example = "1") + @TableField(exist = false) + private Integer canStart; + } diff --git a/server/services/src/main/java/com/doumee/service/business/OrdersService.java b/server/services/src/main/java/com/doumee/service/business/OrdersService.java index 1cb3f2b..f2695ea 100644 --- a/server/services/src/main/java/com/doumee/service/business/OrdersService.java +++ b/server/services/src/main/java/com/doumee/service/business/OrdersService.java @@ -152,4 +152,6 @@ OrderReleaseVO reusePay(ReusePayDTO reusePayDTO); void confirmFee(ConfirmFeeOrderDTO orders); + + void autoCancelWaitPay(); } diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java index f015f0c..7408e89 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java @@ -37,6 +37,7 @@ import nonapi.io.github.classgraph.json.Id; import org.apache.poi.sl.image.ImageHeaderEMF; import org.checkerframework.checker.units.qual.A; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -135,11 +136,11 @@ if(Objects.isNull(category)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鍙傛暟閰嶇疆閿欒,璇疯仈绯荤鐞嗗憳"); } + orders.setPayAccount(orders.getEstimatedAccount()); + Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue()); + orders.setReceiveAccount(orders.getPayAccount() - tcje); //鐢ㄩ璁㈠崟 if(Constants.equalsInteger(orders.getType(),Constants.TWO)){ - orders.setPayAccount(orders.getEstimatedAccount()); - Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue()); - orders.setReceiveAccount(orders.getPayAccount() - tcje); orders.setStatus(Constants.ordersStatus.waitPay.getKey()); orders.setOutTradeNo(UUID.randomUUID().toString().replace("-","")); //鍞よ捣鏀粯涓氬姟 @@ -150,7 +151,7 @@ } orders.setOriginPriceNum1(orders.getPriceNum1()); orders.setOriginPriceNum2(orders.getPriceNum2()); - orders.setOriginEstimatedAccount(orders.getOriginEstimatedAccount()); + orders.setOriginEstimatedAccount(orders.getEstimatedAccount()); orders.setConfirmOtherFee(0l); ordersMapper.insert(orders); @@ -175,7 +176,7 @@ //鍒涘缓鎿嶄綔鏃ュ織 Constants.OrdersLog ordersLog = Constants.OrdersLog.UPLOAD; - String orderTypeInfo = "鐢ㄥ伐鍗�"; + String orderTypeInfo = Constants.getOrderInfo(orders);/*"鐢ㄥ伐鍗�"; if(!Constants.equalsInteger(orders.getType(),Constants.ZERO)){ orderTypeInfo = Constants.equalsInteger(orders.getType(),Constants.ONE)?"鐢ㄨ溅鍗�":"閫侀鍗�"; }else{ @@ -184,7 +185,7 @@ }else{ orderTypeInfo = orderTypeInfo + (Constants.equalsInteger(orders.getWorkType(),Constants.ONE)?"-鍒嗘嫞宸�":"-鍖呰宸�"); } - } + }*/ String logInfo = ordersLog.getInfo() .replace("{param}",orderTypeInfo); this.saveOrderLog(orders,ordersLog, @@ -261,6 +262,7 @@ ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } + Integer priceNum2 = orders.getPriceNum2(); if( (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO) && ( Constants.equalsInteger(orders.getCarType(),Constants.ZERO) @@ -277,7 +279,7 @@ orders.setTotalDays(DateUtil.daysBetweenDates(orders.getEndDate(),orders.getStartDate())+1); if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){ if(Constants.equalsInteger(orders.getWorkType(),Constants.TWO) - && ( Objects.isNull(orders.getCarType()) ) ){ + && ( Objects.isNull(orders.getCarType()) ) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){ @@ -318,6 +320,7 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST); } Long sumPrice = 0L; +// List<CateringDTO> cateringDTOList = new ArrayList<>(); for (CateringDTO cateringDTO:orders.getCateringDTOList()) { if(Objects.isNull(cateringDTO) || StringUtils.isEmpty(cateringDTO.getName()) @@ -340,15 +343,19 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢ㄩ鏍囧噯鏁版嵁閿欒锛岃鍒锋柊閲嶈瘯"); } sumPrice = sumPrice + (cateringDTO.getPrice() * cateringDTO.getNum()) ; + } if(new BigDecimal(sumPrice.toString()).compareTo(orders.getPrice())!=Constants.ZERO){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍗曚环璁$畻閿欒"); } + + orders.setWayInfo(JSONObject.toJSONString(orders.getCateringDTOList())); } if(!orders.getEstimatedAccount().equals(this.getTotal(orders))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閲戦璁$畻閿欒!"); } + orders.setPriceNum2(priceNum2); } @@ -401,9 +408,6 @@ }else{ throw new BusinessException(ResponseStatus.NOT_ALLOWED); } - - - } @@ -451,7 +455,7 @@ orders.setOriginPriceNum1(orders.getPriceNum1()); orders.setOriginPriceNum2(orders.getPriceNum2()); orders.setOriginEstimatedAccount(orders.getOriginEstimatedAccount()); - orders.setConfirmOtherFee(0l); + orders.setConfirmOtherFee(0L); ordersMapper.updateById(orders); } @@ -644,9 +648,9 @@ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(cateringDTOList)){ for (CateringDTO cateringDTO:cateringDTOList) { if(StringUtils.isEmpty(orders.getOrderContent())){ - orders.setOrderContent(cateringDTO.getName()+cateringDTO.getPrice()+" 闇�"+cateringDTO.getNum()+"浠�"); + orders.setOrderContent(cateringDTO.getName()+(new BigDecimal(cateringDTO.getPrice().toString()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP))+" 闇�"+cateringDTO.getNum()+"浠�"); }else{ - orders.setOrderContent(orders.getOrderContent()+" | "+cateringDTO.getName()+cateringDTO.getPrice()+" 闇�"+cateringDTO.getNum()+"浠�"); + orders.setOrderContent(orders.getOrderContent()+" | "+cateringDTO.getName()+(new BigDecimal(cateringDTO.getPrice().toString()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP))+" 闇�"+cateringDTO.getNum()+"浠�"); } } } @@ -685,15 +689,15 @@ //鏌ヨ鐢ㄦ埛鏄惁鏈夊搴旇韩浠� if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){ if(!Constants.equalsInteger(member.getWorkerIdentity(),Constants.TWO)){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎮ㄨ繕鏈敞鍐岃鏈嶅姟锛岃鍓嶅線涓汉淇℃伅涓彁浜ょ敵璇枫��"); + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎮ㄨ繕鏈敞鍐岃鏈嶅姟锛岃鍓嶅線\"鎴戠殑\"椤甸潰鎻愪氦鐢宠"); } }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){ if(!Constants.equalsInteger(member.getDriverIdentity(),Constants.TWO)){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎮ㄨ繕鏈敞鍐岃鏈嶅姟锛岃鍓嶅線涓汉淇℃伅涓彁浜ょ敵璇枫��"); + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎮ㄨ繕鏈敞鍐岃鏈嶅姟锛岃鍓嶅線\"鎴戠殑\"椤甸潰鎻愪氦鐢宠"); } }else{ if(!Constants.equalsInteger(member.getChefIdentity(),Constants.TWO)){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎮ㄨ繕鏈敞鍐岃鏈嶅姟锛岃鍓嶅線涓汉淇℃伅涓彁浜ょ敵璇枫��"); + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎮ㄨ繕鏈敞鍐岃鏈嶅姟锛岃鍓嶅線\"鎴戠殑\"椤甸潰鎻愪氦鐢宠"); } } @@ -759,6 +763,9 @@ if(Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟淇敼寰呯‘璁わ紝鏃犳硶杩涜璇ユ搷浣�"); } + if(orders.getStartDate().getTime()>System.currentTimeMillis()){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鏈埌寮�濮嬫椂闂存棤娉曡繘琛岃鎿嶄綔"); + } orders.setUpdateTime(new Date()); orders.setStatus(Constants.ordersStatus.doing.getKey()); orders.setWorkStartTime(new Date()); @@ -799,6 +806,8 @@ model.setPriceNum1(orders.getTotalDays()); } Long total = this.getTotal(orders); + Long tcje = Long.valueOf(new BigDecimal(total.toString()).multiply(model.getPlatformRata()).intValue()); + Long reciveTotal = total - tcje; ordersMapper.update(new UpdateWrapper<Orders>().lambda() .set(Orders::getStartDate,model.getStartDate()) .set(Orders::getEndDate,model.getEndDate()) @@ -808,6 +817,7 @@ .set(Orders::getUpdateTime,new Date()) .set(Orders::getEstimatedAccount,total) .set(Orders::getOriginEstimatedAccount,total) + .set(Orders::getReceiveAccount,reciveTotal) .eq(Orders::getId,orders.getId()) ); //鍒涘缓鎿嶄綔鏃ュ織 @@ -844,24 +854,28 @@ public Long getTotal(Orders orders){ if(Objects.isNull(orders) ||Objects.isNull(orders.getPrice()) - ||Objects.isNull(orders.getPriceNum1())){ + ||Objects.isNull(orders.getPriceNum1()) + ||Objects.isNull(orders.getType()) + ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } + BigDecimal bigDecimalPrice = BigDecimal.ZERO; if( - (Constants.equalsInteger(orders.getType(),Constants.ZERO) - && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO )) + (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO )) + || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Objects.nonNull(orders.getCarType()) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO ) && Constants.equalsInteger(orders.getCarType(),Constants.TWO)) || Constants.equalsInteger(orders.getType(),Constants.ONE) || Constants.equalsInteger(orders.getType(),Constants.TWO) ){ - orders.setPriceNum2(Constants.ONE); + bigDecimalPrice = orders.getPrice().multiply(new BigDecimal(orders.getPriceNum1().toString())); }else{ if(Objects.isNull(orders.getPriceNum2())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } + bigDecimalPrice = orders.getPrice().multiply(new BigDecimal(orders.getPriceNum1().toString())).multiply(new BigDecimal(orders.getPriceNum2().toString())); } - BigDecimal bigDecimalPrice = orders.getPrice(). - multiply(new BigDecimal(orders.getPriceNum1().toString())) - .multiply(new BigDecimal(orders.getPriceNum2().toString())); + if(Objects.nonNull(orders.getConfirmOtherFee())){ + bigDecimalPrice = bigDecimalPrice.add(new BigDecimal(orders.getConfirmOtherFee().toString())); + } return bigDecimalPrice.divide(new BigDecimal("1"),0,BigDecimal.ROUND_HALF_UP).longValue();//orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2(); } @@ -911,9 +925,12 @@ } orders.setPriceNum1(confirmUpdOrderDTO.getPriceNum1()); orders.setPriceNum2(confirmUpdOrderDTO.getPriceNum2()); + orders.setConfirmOtherFee(confirmUpdOrderDTO.getConfirmOtherFee()); Long totalFee = this.getTotal(orders);//閲嶆柊璁$畻璐圭敤 - Long payFee = totalFee+Constants.formatLongNum(confirmUpdOrderDTO.getConfirmOtherFee());//閲嶆柊璁$畻璐圭敤 - BigDecimal recFee = new BigDecimal(payFee).multiply((new BigDecimal(1).subtract(Constants.formatBigDecimal(orders.getPlatformRata())))).setScale(0, RoundingMode.HALF_UP) ; + Long payFee = totalFee;//閲嶆柊璁$畻璐圭敤 + Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue()); + Long reciveTotal = payFee - tcje; + //BigDecimal recFee = new BigDecimal(payFee).multiply((new BigDecimal(1).subtract(Constants.formatBigDecimal(orders.getPlatformRata())))).setScale(0, RoundingMode.HALF_UP) ; ordersMapper.update(new UpdateWrapper<Orders>().lambda() .set(Orders::getPriceNum1,confirmUpdOrderDTO.getPriceNum1()) .set(Orders::getPriceNum2,confirmUpdOrderDTO.getPriceNum2()) @@ -922,14 +939,21 @@ .set(Orders::getEstimatedAccount,totalFee) .set(Orders::getStatus,Constants.ordersStatus.feeconfirm.getKey()) .set(Orders::getPayAccount,payFee) - .set(Orders::getReceiveAccount,recFee.longValue()) + .set(Orders::getReceiveAccount,reciveTotal) .set(Orders::getUpdateTime,new Date()) + .set(Orders::getConfirmFeeTime,new Date()) .eq(Orders::getId,orders.getId()) ); //璁板綍鍚屾剰淇敼鐨勬棩蹇� Constants.OrdersLog ordersLog = Constants.OrdersLog.FEE_CONFIRM; this.saveOrderLog(orders,ordersLog, ordersLog.getInfo(),confirmUpdOrderDTO.getMember().getId(),null); + + //寰俊閫氱煡 + Member member = memberMapper.selectById(orders.getReleaseMemberId()); + if(Objects.nonNull(member)&& org.apache.commons.lang3.StringUtils.isNotBlank(member.getOpenid())){ + sendWxMessage.waitPayMessage(member.getOpenid(),orders); + } } @@ -1086,13 +1110,13 @@ .eq(Orders::getReleaseMemberId,orders.getReleaseMemberId())); //鏌ヨ鍙栨秷娆℃暟 if(totalCancelTimes<=cancelTimes){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠婃棩璁㈠崟涓诲姩鍙栨秷娆℃暟宸茶秴鍑�"+totalCancelTimes+"娆�,鏃犳硶鍙栨秷璁㈠崟,濡傞渶澶勭悊璇疯仈绯诲鏈�"); + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠婃棩璁㈠崟涓诲姩鍙栨秷娆℃暟宸茶秴鍑�"+totalCancelTimes+"娆�,鏃犳硶鍙栨秷璁㈠崟"); } Integer cancelTimeHour = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIME).getCode()); Long hours = DateUtil.getBetweenHours(new Date(),orders.getStartDate()); if(hours < cancelTimeHour){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璺濈璁㈠崟寮�濮嬫椂闂翠笉瓒�"+cancelTimeHour+"灏忔椂,鏃犳硶鍙栨秷璁㈠崟锛屽闇�澶勭悊璇疯仈绯诲鏈�"); + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璺濈璁㈠崟寮�濮嬫椂闂翠笉瓒�"+cancelTimeHour+"灏忔椂,鏃犳硶鍙栨秷璁㈠崟"); } if(Constants.equalsInteger(orders.getType(),Constants.TWO)){ @@ -1132,6 +1156,7 @@ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(members)){ List<String> openIdList = members.stream().map(i->i.getOpenid()).collect(Collectors.toList()); //鍙戦�佸井淇¢�氱煡 + orders.setCancelTime(new Date()); sendWxMessage.cancelMessage(openIdList,orders,Constants.ONE); } @@ -1169,16 +1194,17 @@ .eq(OrderLog::getMemberId,member.getId())); //鏌ヨ鍙栨秷娆℃暟 if(totalCancelTimes<=cancelTimes){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠婃棩璁㈠崟涓诲姩鍙栨秷娆℃暟宸茶秴鍑�"+totalCancelTimes+"娆�,鏃犳硶鍙栨秷璁㈠崟,濡傞渶澶勭悊璇疯仈绯诲鏈�"); + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浠婃棩璁㈠崟涓诲姩鍙栨秷娆℃暟宸茶秴鍑�"+totalCancelTimes+"娆�,鏃犳硶鍙栨秷璁㈠崟"); } Integer cancelTimeHour = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RECEIVE_CANCEL_TIME).getCode()); Long hours = DateUtil.getBetweenHours(new Date(),orders.getStartDate()); if(hours < cancelTimeHour){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璺濈璁㈠崟寮�濮嬫椂闂翠笉瓒�"+cancelTimeHour+"灏忔椂,鏃犳硶鍙栨秷璁㈠崟锛屽闇�澶勭悊璇疯仈绯诲鏈�"); + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璺濈璁㈠崟寮�濮嬫椂闂翠笉瓒�"+cancelTimeHour+"灏忔椂,鏃犳硶鍙栨秷璁㈠崟"); } ordersMapper.update(new UpdateWrapper<Orders>().lambda() .set(Orders::getUpdateTime,new Date()) + .set(Orders::getCancelTime,new Date()) .set(Orders::getStatus,Constants.ordersStatus.wait.getKey()) .set(Orders::getAcceptMemberId,null) .set(Orders::getAcceptType,null) @@ -1199,6 +1225,7 @@ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(members)){ List<String> openIdList = members.stream().map(i->i.getOpenid()).collect(Collectors.toList()); //鍙戦�佸井淇¢�氱煡 + orders.setCancelTime(new Date()); sendWxMessage.cancelMessage(openIdList,orders,Constants.TWO); } //鐭俊閫氱煡 @@ -1224,9 +1251,16 @@ if(Objects.isNull(orders)||Constants.equalsInteger(orders.getDeleted(),Constants.ONE)){ throw new BusinessException(ResponseStatus.DATA_EMPTY); } - if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜鍙栨秷"); + if(Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())){ + if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.doing.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜鍙栨秷"); + } + }else{ + if(!Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.feeconfirm.getKey())){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜鍙栨秷"); + } } + if(!Constants.equalsInteger(orders.getReleaseMemberId(),doneOrderDTO.getMember().getId())){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴偍鐨勮鍗曟棤娉曡繘琛岃鎿嶄綔"); } @@ -1242,7 +1276,8 @@ if(!Constants.equalsInteger(orders.getType(),Constants.TWO)){ orders.setPayAccount(doneOrderDTO.getAmount()); //鎻愭垚閲戦 - Long tcje = (new BigDecimal(orders.getPayAccount().toString()).multiply(Constants.formatBigDecimal(orders.getPlatformRata())).setScale(0,RoundingMode.HALF_UP).longValue()); +// Long tcje = (new BigDecimal(orders.getPayAccount().toString()).multiply(Constants.formatBigDecimal(orders.getPlatformRata())).setScale(0,RoundingMode.HALF_UP).longValue()); + Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue()); orders.setReceiveAccount(orders.getPayAccount() - tcje); orders.setOutTradeNo(UUID.randomUUID().toString().replace("-","")); ordersMapper.updateById(orders); @@ -1316,21 +1351,28 @@ } if(!((( Constants.equalsInteger(orders.getType(),Constants.TWO) && Constants.equalsInteger(orders.getStatus(),Constants.ZERO) ) - || ( !Constants.equalsInteger(orders.getType(),Constants.TWO) && Constants.equalsInteger(orders.getStatus(),Constants.THREE) )) + || ( !Constants.equalsInteger(orders.getType(),Constants.TWO) && Constants.equalsInteger(orders.getStatus(),Constants.FIVE) )) && Constants.equalsInteger(orders.getPayStatus(),Constants.ZERO) )){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆"); } + Member payMember = memberMapper.selectById(reusePayDTO.getMember().getId()); + if(Objects.isNull(payMember)){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛淇℃伅寮傚父"); + } + OrderReleaseVO orderReleaseVO = new OrderReleaseVO(); if(!Constants.equalsInteger(orders.getType(),Constants.TWO)){ orders.setPayAccount(reusePayDTO.getAmount()); //鎻愭垚閲戦 Long tcje = Long.valueOf(new BigDecimal(orders.getPayAccount().toString()).multiply(orders.getPlatformRata()).intValue()); orders.setReceiveAccount(orders.getPayAccount() - tcje); + orders.setOutTradeNo(UUID.randomUUID().toString().replace("-","")); + ordersMapper.updateById(orders); } orders.setOutTradeNo(UUID.randomUUID().toString().replace("-","")); ordersMapper.updateById(orders); //鍞よ捣鏀粯涓氬姟 - Object object = this.getWxPayResponse(orders,orders.getMember().getOpenid()); + Object object = this.getWxPayResponse(orders,payMember.getOpenid()); orderReleaseVO.setObject(object); orderReleaseVO.setId(orders.getId()); return orderReleaseVO; @@ -1394,6 +1436,7 @@ List<String> openIdList = members.stream().map(i->i.getOpenid()).collect(Collectors.toList()); orders.setCancelTime(new Date()); //鍙戦�佸井淇¢�氱煡 + orders.setCancelTime(new Date()); sendWxMessage.cancelMessage(openIdList,orders,Constants.ZERO); } //鐭俊閫氱煡鍙戝崟鏂� @@ -1493,7 +1536,7 @@ } }else{ //闈炵敤椁愮被璁㈠崟 - if(!Constants.equalsInteger(orders.getStatus(),Constants.THREE)){ + if(!Constants.equalsInteger(orders.getStatus(),Constants.FIVE)){ return ("澶勭悊鎴愬姛!"); }else{ //澶勭悊鏀粯瀹屾垚閫昏緫 @@ -1573,9 +1616,7 @@ Utils.MP.blankToNull(pageWrap.getModel()); Orders model = pageWrap.getModel(); if(Objects.isNull(model) - || Objects.isNull(model.getQueryLat()) - || Objects.isNull(model.getQueryLgt()) - || Objects.isNull(model.getQueryMyOrderType()) + || Objects.isNull(model.getQueryMyOrderType()) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } @@ -1620,24 +1661,29 @@ .select("c2.name",Orders::getTransportTypeName) .leftJoin(" category c1 on t.category_id = c1.id ") .leftJoin(" category c2 on t.TRANSPORT_TYPE_ID = c2.id ") - .select(" case when T.LGT IS NULL OR T.LAT IS NULL THEN 0 " + - " when t.TYPE = 0 then CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+workerLgt+", "+workerLat+" )) /1000,DECIMAL(15,2)) " + - " when t.TYPE = 1 then CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+driverLgt+", "+driverLat+" )) /1000,DECIMAL(15,2)) " + - " else CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+chefLgt+", "+chefLat+" )) /1000,DECIMAL(15,2)) end " , Orders::getDistance) - .eq(Objects.nonNull(model.getType()),Orders::getType,model.getType()); + .eq(Objects.nonNull(model.getType()),Orders::getType,model.getType()) + .eq(Objects.nonNull(model.getCommentStatus()),Orders::getCommentStatus,model.getCommentStatus());; + if(!(Objects.isNull(model.getQueryLat())||Objects.isNull(model.getQueryLgt()))){ + queryWrapper.select(" case when T.LGT IS NULL OR T.LAT IS NULL THEN 0 " + + " when t.TYPE = 0 then CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+workerLgt+", "+workerLat+" )) /1000,DECIMAL(15,2)) " + + " when t.TYPE = 1 then CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+driverLgt+", "+driverLat+" )) /1000,DECIMAL(15,2)) " + + " else CONVERT( ST_Distance_Sphere ( POINT ( t.LGT, t.LAT ), POINT ( "+chefLgt+", "+chefLat+" )) /1000,DECIMAL(15,2)) end " , Orders::getDistance); + } if(Objects.nonNull(model.getQueryMyOrderType())){ if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ZERO)){ //鍙戝崟鏂� 鎴戠殑璁㈠崟 queryWrapper.eq(Orders::getReleaseMemberId,model.getMember().getId()); - queryWrapper.eq(Objects.nonNull(model.getStatus()),Orders::getStatus,model.getStatus()); + queryWrapper.eq(Objects.nonNull(model.getStatus())&&!Constants.equalsInteger(model.getStatus(),Constants.ordersStatus.waitPay.getKey()),Orders::getStatus,model.getStatus()); + queryWrapper.in(Objects.nonNull(model.getStatus())&&Constants.equalsInteger(model.getStatus(),Constants.ordersStatus.waitPay.getKey()),Orders::getStatus,model.getStatus(),Constants.ordersStatus.feeconfirm.getKey()); queryWrapper.orderByDesc(Orders::getCreateTime); }else if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ONE)){ //鎺ュ崟鏂� 鎴戠殑璁㈠崟 queryWrapper.eq(Orders::getAcceptMemberId,model.getMember().getId()); queryWrapper.eq(Objects.nonNull(model.getStatus()),Orders::getStatus,model.getStatus()); +// queryWrapper.in(Objects.nonNull(model.getStatus())&&Constants.equalsInteger(model.getStatus(),Constants.ordersStatus.waitPay.getKey()),Orders::getStatus,model.getStatus(),Constants.ordersStatus.feeconfirm.getKey()); queryWrapper.orderByDesc(Orders::getAcceptTime); }else{ - //鏌ヨ鐢ㄦ埛鐨勬帴鍗曟潈閲� + //鏌ヨ鐢ㄦ埛鐨勬帴鍗曟潈閲� 鎺ュ崟澶у巺 ReceiveWeight receiveWeight = receiveWeightMapper.selectOne(new QueryWrapper<ReceiveWeight>().lambda().eq(ReceiveWeight::getDeleted,Constants.ZERO).apply(" RECEIVE_MIN < "+model.getMember().getReceiveNum()+" and RECEIVE_MAX > " + model.getMember().getReceiveNum()).last(" limit 1 ")); if(Objects.nonNull(receiveWeight)){ queryWrapper.apply(" DATE_ADD(t.CREATE_TIME, INTERVAL "+receiveWeight.getDelayTime()+" MINUTE) < now() "); @@ -1658,38 +1704,13 @@ IPage<Orders> iPage = ordersMapper.selectJoinPage(page,Orders.class,queryWrapper); for (Orders orders:iPage.getRecords()) { this.getPriceUnit(orders); + if(Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ZERO)||Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ONE)){ + orders.setStatusName( + Constants.equalsInteger(model.getQueryMyOrderType(),Constants.ZERO)?Constants.ordersStatus.getName(orders.getStatus()): + Constants.ordersStatus.getInfo(orders.getStatus()) + ); + } } -// if(Objects.nonNull(model.getQueryMyOrderType())&&Constants.equalsInteger(model.getQueryMyOrderType(),Constants.TWO)){ -// if(Constants.equalsInteger(model.getMember().getUseIdentity(),Constants.ONE)){ -// model.getMember().setWorkerIdentityModel( -// identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda() -// .eq(IdentityInfo::getMemberId,model.getMember().getId()) -// .eq(IdentityInfo::getType,Constants.ZERO) -// .eq(IdentityInfo::getAuditStatus,Constants.TWO) -// .last("limit 1") -// ) -// ); -// model.getMember().setDriverIdentityModel( -// identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda() -// .eq(IdentityInfo::getMemberId,model.getMember().getId()) -// .eq(IdentityInfo::getType,Constants.ONE) -// .eq(IdentityInfo::getAuditStatus,Constants.TWO) -// .last("limit 1") -// ) -// ); -// model.getMember().setChefIdentityModel( -// identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda() -// .eq(IdentityInfo::getMemberId,model.getMember().getId()) -// .eq(IdentityInfo::getType,Constants.TWO) -// .eq(IdentityInfo::getAuditStatus,Constants.TWO) -// .last("limit 1") -// ) -// ); -// } -// for (Orders orders:iPage.getRecords()) { -// this.getDistance(model.getMember(),orders); -// } -// } return PageData.from(iPage); } @@ -1789,12 +1810,25 @@ orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus())); orders.setCancelStatus(Constants.ZERO); if(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())&&Constants.equalsInteger(orders.getIsUpdate(),Constants.ONE)){ - orders.setConfirmCountdown(DateUtil.getXMinuteAfterDate(orders.getIsUpdateTime(),60).getTime() - System.currentTimeMillis()); + String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_CONFIRM).getCode(); + orders.setConfirmCountdown(DateUtil.getXMinuteAfterDate(orders.getIsUpdateTime(),Integer.valueOf(autoConfirmTime)).getTime() - System.currentTimeMillis()); + if(orders.getConfirmCountdown()<=Constants.ZERO){ + orders.setConfirmCountdown(0L); + } } - + if(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.waitPay.getKey())){ + orders.setCancelCountdown(DateUtil.getXMinuteAfterDate(orders.getCreateTime(),15).getTime() - System.currentTimeMillis()); + if(orders.getCancelCountdown()<=Constants.ZERO){ + orders.setCancelCountdown(0L); + } + } this.getPriceUnit(orders); + orders.setCanStart(Constants.ZERO); if(orders.getStatus() <= Constants.ordersStatus.accept.getKey()){ if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){ + if(Constants.equalsInteger(orders.getStatus(),Constants.ordersStatus.accept.getKey())&&orders.getStartDate().getTime() <= System.currentTimeMillis()){ + orders.setCanStart(Constants.ONE); + } //鍒ゆ柇鏄惁鍙慨鏀� 宸插彇娑堟鏁� 涓� 鏃堕棿闄愬埗 Integer totalCancelTimes = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RELEASE_CANCEL_TIMES).getCode()); Long cancelTimes = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda() @@ -1893,7 +1927,7 @@ BigDecimal lat = orders.getLat(); BigDecimal lgt = orders.getLgt(); //鏌ヨ鑼冨洿鍐呯殑浼氬憳 - List<Member> memberList = memberMapper.getList(lgt,lat,orders.getType()); + List<Member> memberList = memberMapper.getList(lgt,lat,orders.getType(),orders.getReleaseMemberId()); // memberMapper.selectList(new MPJLambdaWrapper<Member>() // .select(Member::getId,Member::getScore) // .select(" ifnull((select r.level from receive_weight r where r.RECEIVE_MAX > RECEIVE_NUM and RECEIVE_NUM > r.RECEIVE_MIN limit 1 ),0) " ,Member::getLevel) @@ -1915,7 +1949,7 @@ Member releaseMember = memberMapper.selectById(orders.getReleaseMemberId()); //鑷姩娲惧崟 Orders model = ordersMapper.selectById(orders.getId()); - if(!Constants.equalsInteger(model.getStatus(),Constants.ONE) || Constants.equalsInteger(model.getId(),model.getReleaseMemberId())){ + if(!Constants.equalsInteger(model.getStatus(),Constants.ONE) || Constants.equalsInteger(releaseMember.getId(),model.getReleaseMemberId())){ //濡傛灉璁㈠崟宸插垹闄� 骞朵笖闈炲彂甯冩柟 continue; } @@ -1999,7 +2033,8 @@ public void autoConfirm(){ String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_CONFIRM).getCode(); List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda() - .eq(Orders::getStatus,Constants.ordersStatus.accept).eq(Orders::getIsUpdate,Constants.ONE) + .eq(Orders::getStatus,Constants.ordersStatus.accept.getKey()) + .eq(Orders::getIsUpdate,Constants.ONE) .apply(" DATE_ADD(IS_UPDATE_TIME, INTERVAL "+autoConfirmTime+" MINUTE) < now() ") .last("limit 100") ); @@ -2013,6 +2048,34 @@ //璁板綍鍚屾剰淇敼鐨勬棩蹇� Constants.OrdersLog ordersLog = Constants.OrdersLog.AUTO_AGREE; this.saveOrderLog(orders,ordersLog, + ordersLog.getInfo(),null,null); + } + } + } + + + + //鑷姩鍙栨秷 璁㈠崟鏈敮浠� + @Override + @Transactional(rollbackFor = {Exception.class,BusinessException.class}) + public void autoCancelWaitPay(){ + List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda() + .eq(Orders::getStatus,Constants.ordersStatus.waitPay) + .apply(" DATE_ADD(CREATE_TIME, INTERVAL 15 MINUTE) < now() ") + .last("limit 100") + ); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ordersList)){ + for (Orders orders:ordersList) { + ordersMapper.update(new UpdateWrapper<Orders>().lambda() + .set(Orders::getStatus,Constants.ordersStatus.cancel.getKey()) + .set(Orders::getUpdateTime,DateUtil.getCurrDateTime()) + .set(Orders::getCancelTime,DateUtil.getCurrDateTime()) + .set(Orders::getCancelType,Constants.TWO) + .eq(Orders::getId,orders.getId()) + ); + //璁板綍鍚屾剰淇敼鐨勬棩蹇� + Constants.OrdersLog ordersLog = Constants.OrdersLog.SYSTEM_CANCEL; + this.saveOrderLog(orders,ordersLog, ordersLog.getInfo(),orders.getAcceptMemberId(),null); } } diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java index 1a0dd27..20bf1f1 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java @@ -268,11 +268,25 @@ .set(WithdrawalOrders::getUpdateTime, DateUtil.getCurrDateTime()) .eq(WithdrawalOrders::getOutBillNo,outBillNo) ); + //淇敼娴佹按璁板綍鐘舵�� + memberRevenueMapper.update(new UpdateWrapper<MemberRevenue>().lambda() + .set(MemberRevenue::getStatus,Constants.ZERO) + .set(MemberRevenue::getUpdateTime, DateUtil.getCurrDateTime()) + .eq(MemberRevenue::getObjId,withdrawalOrders.getId()) + .eq(MemberRevenue::getObjType,Constants.ONE) + ); withdrawalOrders.setUpdateTime(new Date()); sendWxMessage.withdrawalMessage(member.getOpenid(),withdrawalOrders); }else { //鏇存柊鐢ㄦ埛浣欓 memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" AMOUNT = AMOUNT + " + withdrawalOrders.getAmount() ).eq(Member::getId,withdrawalOrders.getMemberId())); + //淇敼娴佹按璁板綍鐘舵�� + memberRevenueMapper.update(new UpdateWrapper<MemberRevenue>().lambda() + .set(MemberRevenue::getStatus,Constants.ONE) + .set(MemberRevenue::getUpdateTime, DateUtil.getCurrDateTime()) + .eq(MemberRevenue::getObjId,withdrawalOrders.getId()) + .eq(MemberRevenue::getObjType,Constants.ONE) + ); //瀛樺偍娴佹按璁板綍 MemberRevenue memberRevenue = new MemberRevenue(); memberRevenue.setCreateTime(new Date()); diff --git a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java index 6a3aee3..4262967 100644 --- a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java +++ b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java @@ -65,6 +65,7 @@ ordersService.update(orders); return ApiResponse.success("鎿嶄綔鎴愬姛"); } + @LoginRequired @ApiOperation(value = "鎺ュ崟鏂圭‘璁よ鍗曡垂鐢� - 鎺ュ崟鏂�", notes = "灏忕▼搴忕") @PostMapping("/confirmFee") -- Gitblit v1.9.3