From 99e92a155a1b21a8386b482e7aab6fef649aeffa Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 28 八月 2025 17:47:03 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/dao/business/MemberMapper.java | 19 ++++
server/services/src/main/java/com/doumee/service/business/AliSmsService.java | 4
server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java | 1
server/services/src/main/java/com/doumee/dao/business/model/Orders.java | 7 +
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 2
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 96 ++++++++++++++----------
server/services/src/main/java/com/doumee/config/wx/SendWxMessage.java | 93 ++++++++++++----------
7 files changed, 134 insertions(+), 88 deletions(-)
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 f612666..59ece1c 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
@@ -4,6 +4,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.model.IdentityInfo;
import com.doumee.dao.business.model.Orders;
import com.doumee.dao.business.model.WithdrawalOrders;
@@ -69,14 +70,15 @@
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("phrase6", new TemplateData(Constants.equalsInteger(identityInfo.getAuditStatus(),Constants.TWO)?"閫氳繃":"鏈�氳繃"));
- m.put("time12", new TemplateData(DateUtil.getFomartDate(identityInfo.getAuditTime(),"yyyy-MM-dd HH:mm")));
+ 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.setPage(mineUrl);
wxMsgVO.setData(m);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁よ瘉淇℃伅锛歿}", JSONObject.toJSONString(wxMsgVO));
- ResponseEntity<String> responseEntity =
- restTemplate.postForEntity(url, wxMsgVO, String.class);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁よ瘉淇℃伅锛歿}", JSONObject.toJSONString(responseEntity));
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁よ瘉淇℃伅锛歿}", JSONObject.toJSONString(wxMsgVO));
+ String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO));
+// ResponseEntity<String> responseEntity =
+// restTemplate.postForEntity(url, wxMsgVO, String.class);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁よ瘉淇℃伅锛歿}", JSONObject.toJSONString(responseEntity));
}catch (WxErrorException wxErrorException){
}
@@ -95,9 +97,10 @@
RestTemplate restTemplate = new RestTemplate();
try{
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鍙栨秷涓氬姟 -> accessToken锛歿}",accessToken);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鍙栨秷涓氬姟 -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鍙栨秷涓氬姟URL锛歿}", url);
//鎷兼帴鎺ㄩ�佺殑妯＄増
WxMsgVO wxMsgVO = new WxMsgVO();
//璁㈤槄娑堟伅妯℃澘id
@@ -110,20 +113,21 @@
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;
- pageUrl.replace("{id}",orders.getId().toString());
+ pageUrl = pageUrl.replace("{id}",orders.getId().toString());
wxMsgVO.setPage(pageUrl);
wxMsgVO.setData(m);
if(CollectionUtils.isNotEmpty(openidList)){
for (String openid:openidList) {
//鐢ㄦ埛鐨刼penid锛堣鍙戦�佺粰閭ｄ釜鐢ㄦ埛锛�
wxMsgVO.setTouser(openid);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鍙栨秷涓氬姟锛歿}", JSONObject.toJSONString(wxMsgVO));
- ResponseEntity<String> responseEntity =
- restTemplate.postForEntity(url, wxMsgVO, String.class);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鍙栨秷涓氬姟锛歿}", JSONObject.toJSONString(responseEntity));
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鍙栨秷涓氬姟锛歿}", JSONObject.toJSONString(wxMsgVO));
+ String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO));
+// ResponseEntity<String> responseEntity =
+// restTemplate.postForEntity(url, wxMsgVO, String.class);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鍙栨秷涓氬姟锛歿}", JSONObject.toJSONString(responseEntity));
}
}else{
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鍙栨秷涓氬姟锛歿}", "鏃犱汉鍛樹俊鎭�");
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鍙栨秷涓氬姟锛歿}", "鏃犱汉鍛樹俊鎭�");
}
}catch (WxErrorException wxErrorException){
@@ -144,7 +148,7 @@
RestTemplate restTemplate = new RestTemplate();
try{
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鎺ュ崟涓氬姟 -> accessToken锛歿}",accessToken);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鎺ュ崟涓氬姟 -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
//鎷兼帴鎺ㄩ�佺殑妯＄増
@@ -159,14 +163,15 @@
m.put("phone_number8", new TemplateData(memberPhone));
String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight:
Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail;
- pageUrl.replace("{id}",orders.getId().toString());
+ pageUrl = pageUrl.replace("{id}",orders.getId().toString());
wxMsgVO.setPage(pageUrl);
wxMsgVO.setData(m);
//鐢ㄦ埛鐨刼penid锛堣鍙戦�佺粰閭ｄ釜鐢ㄦ埛锛�
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鎺ュ崟閫氱煡锛歿}", JSONObject.toJSONString(wxMsgVO));
- ResponseEntity<String> responseEntity =
- restTemplate.postForEntity(url, wxMsgVO, String.class);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鎺ュ崟閫氱煡锛歿}", JSONObject.toJSONString(responseEntity));
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鎺ュ崟閫氱煡锛歿}", JSONObject.toJSONString(wxMsgVO));
+ String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO));
+// ResponseEntity<String> responseEntity =
+// restTemplate.postForEntity(url, wxMsgVO, String.class);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鎺ュ崟閫氱煡锛歿}", JSONObject.toJSONString(responseEntity));
}catch (WxErrorException wxErrorException){
}
@@ -178,7 +183,7 @@
RestTemplate restTemplate = new RestTemplate();
try{
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鍙樻洿閫氱煡 -> accessToken锛歿}",accessToken);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鍙樻洿閫氱煡 -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
//鎷兼帴鎺ㄩ�佺殑妯＄増
@@ -190,17 +195,18 @@
m.put("character_string1", new TemplateData(orders.getCode()));
m.put("thing3", new TemplateData("鍙樻洿璁㈠崟鏃ユ湡"));
//鍙樻洿鍚庢棩鏈燂細07-23鑷�07-25
- m.put("thing5", new TemplateData("鍙樻洿鍚庢棩鏈�:" +DateUtil.getFomartDate(orders.getStartDate(),"MM-dd") + "鑷�" +DateUtil.getFomartDate(orders.getEndDate(),"MM-dd")));
+ m.put("thing5", new TemplateData("鍙樻洿鍚庢棩鏈燂細" +DateUtil.getFomartDate(orders.getStartDate(),"MM-dd") + "鑷�" +DateUtil.getFomartDate(orders.getEndDate(),"MM-dd")));
String pageUrl = Constants.equalsInteger(orders.getType(),Constants.orderType.hyd.getKey())?orderDetailFreight:
Constants.equalsInteger(orders.getType(),Constants.orderType.scd.getKey())?orderDetailFood:orderDetail;
- pageUrl.replace("{id}",orders.getId().toString());
+ pageUrl = pageUrl.replace("{id}",orders.getId().toString());
wxMsgVO.setPage(pageUrl);
wxMsgVO.setData(m);
//鐢ㄦ埛鐨刼penid锛堣鍙戦�佺粰閭ｄ釜鐢ㄦ埛锛�
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鍙樻洿閫氱煡锛歿}", JSONObject.toJSONString(wxMsgVO));
- ResponseEntity<String> responseEntity =
- restTemplate.postForEntity(url, wxMsgVO, String.class);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鍙樻洿閫氱煡锛歿}", JSONObject.toJSONString(responseEntity));
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鍙樻洿閫氱煡锛歿}", JSONObject.toJSONString(wxMsgVO));
+ String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO));
+// ResponseEntity<String> responseEntity =
+// restTemplate.postForEntity(url, wxMsgVO, String.class);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鍙樻洿閫氱煡锛歿}", JSONObject.toJSONString(responseEntity));
}catch (WxErrorException wxErrorException){
}
@@ -214,7 +220,7 @@
try{
RestTemplate restTemplate = new RestTemplate();
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鎻愮幇鎴愬姛閫氱煡 -> accessToken锛歿}",accessToken);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鎻愮幇鎴愬姛閫氱煡 -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
//鎷兼帴鎺ㄩ�佺殑妯＄増
@@ -230,10 +236,11 @@
wxMsgVO.setPage(balanceUrl);
wxMsgVO.setData(m);
//鐢ㄦ埛鐨刼penid锛堣鍙戦�佺粰閭ｄ釜鐢ㄦ埛锛�
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鎻愮幇鎴愬姛閫氱煡锛歿}", JSONObject.toJSONString(wxMsgVO));
- ResponseEntity<String> responseEntity =
- restTemplate.postForEntity(url, wxMsgVO, String.class);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鎻愮幇鎴愬姛閫氱煡锛歿}", JSONObject.toJSONString(responseEntity));
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鎻愮幇鎴愬姛閫氱煡锛歿}", JSONObject.toJSONString(wxMsgVO));
+ String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO));
+// ResponseEntity<String> responseEntity =
+// restTemplate.postForEntity(url, wxMsgVO, String.class);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鎻愮幇鎴愬姛閫氱煡锛歿}", JSONObject.toJSONString(responseEntity));
}catch (WxErrorException wxErrorException){
}
@@ -244,7 +251,7 @@
try{
RestTemplate restTemplate = new RestTemplate();
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鏀剁泭閫氱煡 -> accessToken锛歿}",accessToken);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 璁㈠崟鏀剁泭閫氱煡 -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
//鎷兼帴鎺ㄩ�佺殑妯＄増
@@ -260,11 +267,12 @@
m.put("date7", new TemplateData(DateUtil.getFomartDate(new Date(),"yyyy-MM-dd HH:mm:ss")));
wxMsgVO.setPage(balanceUrl);
wxMsgVO.setData(m);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鏀剁泭閫氱煡锛歿}", JSONObject.toJSONString(wxMsgVO));
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鏀剁泭閫氱煡锛歿}", JSONObject.toJSONString(wxMsgVO));
//鐢ㄦ埛鐨刼penid锛堣鍙戦�佺粰閭ｄ釜鐢ㄦ埛锛�
- ResponseEntity<String> responseEntity =
- restTemplate.postForEntity(url, wxMsgVO, String.class);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鏀剁泭閫氱煡锛歿}", JSONObject.toJSONString(responseEntity));
+ String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO));
+// ResponseEntity<String> responseEntity =
+// restTemplate.postForEntity(url, wxMsgVO, String.class);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 璁㈠崟鏀剁泭閫氱煡锛歿}", JSONObject.toJSONString(responseEntity));
}catch (WxErrorException wxErrorException){
}
@@ -275,7 +283,7 @@
try{
RestTemplate restTemplate = new RestTemplate();
String accessToken = WxMiniConfig.wxMaService.getAccessToken();
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鏈嶅姟娲惧崟 -> accessToken锛歿}",accessToken);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 - 鏈嶅姟娲惧崟 -> accessToken锛歿}",accessToken);
//杩欓噷绠�鍗曡捣瑙佹垜浠瘡娆￠兘鑾峰彇鏈�鏂扮殑access_token锛堟椂闂村紑鍙戜腑锛屽簲璇ュ湪access_token蹇繃鏈熸椂鍐嶉噸鏂拌幏鍙栵級
String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
//鎷兼帴鎺ㄩ�佺殑妯＄増
@@ -291,14 +299,15 @@
m.put("thing12", new TemplateData("宸ュ崟灏嗕簬"+DateUtil.getFomartDate(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.replace("{id}",orders.getId().toString());
+ pageUrl = pageUrl.replace("{id}",orders.getId().toString());
wxMsgVO.setPage(pageUrl);
wxMsgVO.setData(m);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鏈嶅姟娲惧崟锛歿}", JSONObject.toJSONString(wxMsgVO));
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鏈嶅姟娲惧崟锛歿}", JSONObject.toJSONString(wxMsgVO));
//鐢ㄦ埛鐨刼penid锛堣鍙戦�佺粰閭ｄ釜鐢ㄦ埛锛�
- ResponseEntity<String> responseEntity =
- restTemplate.postForEntity(url, wxMsgVO, String.class);
- log.info("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鏈嶅姟娲惧崟锛歿}", JSONObject.toJSONString(responseEntity));
+ String responseEntity = HttpsUtil.postJson(url,JSONObject.toJSONString(wxMsgVO));
+// ResponseEntity<String> responseEntity =
+// restTemplate.postForEntity(url, wxMsgVO, String.class);
+ log.error("寰俊灏忕▼搴�->寰俊娑堟伅閫氱煡 鏈嶅姟娲惧崟锛歿}", JSONObject.toJSONString(responseEntity));
}catch (WxErrorException wxErrorException){
}
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 9438b6c..11e2e15 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
@@ -2,11 +2,28 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Member;
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
/**
* @author 姹熻箘韫�
* @date 2025/07/09 12:00
*/
-public interface MemberMapper extends BaseMapper<Member> {
+public interface MemberMapper extends MPJBaseMapper<Member> {
+
+ @Select(" select * , " +
+ " ifnull((select r.level from receive_weight r where r.RECEIVE_MAX > RECEIVE_NUM and RECEIVE_NUM > r.RECEIVE_MIN limit 1 ),0) as level ," +
+ " ifnull( (select CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( #{lgt}, #{lat} )) /1000,DECIMAL(15,2)) from identity_info ii where ii.AUDIT_STATUS = 2 and type = 0 and ii.member_id = ID limit 1 ),0) as distance " +
+ " from member " +
+ " 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 " +
+ " )" +
+ " order by level , score desc , distance asc ")
+ List<Member> getList(@Param("lgt") BigDecimal lgt, @Param("lat") BigDecimal lat, @Param("orderType") Integer orderType);
}
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 197b04e..7f9156c 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
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@@ -100,14 +101,13 @@
private String supplement;
@ApiModelProperty(value = "璐圭敤鏍囧噯", example = "1")
- private Long price;
+ private BigDecimal price;
@ApiModelProperty(value = "棰勪及璐圭敤", example = "1")
private Long estimatedAccount;
@ApiModelProperty(value = "瀹為檯鏀粯璐圭敤", example = "1")
private Long payAccount;
-
@ApiModelProperty(value = "瀹炴敹璐圭敤", example = "1")
private Long receiveAccount;
@@ -253,6 +253,9 @@
@TableField(exist = false)
private Integer queryMyOrderType;
+ @Schema(description ="淇敼纭鍊掕鏃�")
+ @TableField(exist = false)
+ private Long confirmCountdown;
@ApiModelProperty(value = "闇�姹傜被鍨�")
@TableField(exist = false)
diff --git a/server/services/src/main/java/com/doumee/service/business/AliSmsService.java b/server/services/src/main/java/com/doumee/service/business/AliSmsService.java
index 255d7da..b9b3174 100644
--- a/server/services/src/main/java/com/doumee/service/business/AliSmsService.java
+++ b/server/services/src/main/java/com/doumee/service/business/AliSmsService.java
@@ -52,10 +52,10 @@
Constants.smsContent smsContent = Constants.smsContent.getSmsContent(type);
Map<String,Object> tempParam = new HashMap<>();
if(smsContent.getName().indexOf("time1")>=Constants.ZERO){
- tempParam.put("time1", DateUtil.formatDate(orders.getStartDate(),"MM-dd"));
+ tempParam.put("time1", DateUtil.formatDate(orders.getStartDate(),"yyyy-MM-dd")+" ");
}
if(smsContent.getName().indexOf("time2")>=Constants.ZERO){
- tempParam.put("time2", DateUtil.formatDate(orders.getEndDate(),"MM-dd"));
+ tempParam.put("time2", " "+DateUtil.formatDate(orders.getEndDate(),"yyyy-MM-dd"));
}
if(smsContent.getName().indexOf("money")>=Constants.ZERO){
tempParam.put("money", new BigDecimal(orders.getReceiveAccount().toString()).divide(new BigDecimal("100"),2,BigDecimal.ROUND_HALF_UP)+"鍏�");
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
index 298a4fd..fd591be 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/IdentityInfoServiceImpl.java
@@ -162,6 +162,7 @@
if(!Constants.equalsInteger(model.getAuditStatus(),Constants.THREE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐘舵�佹棤娉曡繘琛岃鎿嶄綔");
}
+ identityInfo.setAuditRemark("");
identityInfo.setUpdateTime(new Date());
identityInfo.setAuditStatus(Constants.ONE);
identityInfoMapper.updateById(identityInfo);
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 1f9af81..16cb9e2 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -313,7 +313,7 @@
member.setOpenid(wxPhoneRequest.getOpenid());
member.setTelephone(mobile);
member.setNickName(mobile);
- member.setCoverImage("1.png");
+// member.setCoverImage("1.png");
member.setWorkerIdentity(Constants.ZERO);
member.setDriverIdentity(Constants.ZERO);
member.setChefIdentity(Constants.ZERO);
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 465e7f6..e1599db 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
@@ -333,7 +333,7 @@
}
sumPrice = sumPrice + (cateringDTO.getPrice() * cateringDTO.getNum()) ;
}
- if(!sumPrice.equals(orders.getPrice())){
+ if(new BigDecimal(sumPrice.toString()).compareTo(orders.getPrice())!=Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍗曚环璁＄畻閿欒");
}
orders.setWayInfo(JSONObject.toJSONString(orders.getCateringDTOList()));
@@ -706,14 +706,20 @@
.eq(IdentityInfo::getAuditStatus,Constants.TWO)
.last("limit 1")
);
+ Member releaseMember = memberMapper.selectById(orders.getReleaseMemberId());
- if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getOpenid())&&Objects.nonNull(wokerIdentityInfo)){
- //鍙戦�佸井淇￠�氱煡
- sendWxMessage.acceptMessage(member.getOpenid(),orders,wokerIdentityInfo.getLinkName(),wokerIdentityInfo.getTelephone());
+ if(Objects.nonNull(releaseMember)){
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(releaseMember.getOpenid())&&Objects.nonNull(wokerIdentityInfo)){
+ //鍙戦�佸井淇￠�氱煡
+ sendWxMessage.acceptMessage(releaseMember.getOpenid(),orders,wokerIdentityInfo.getLinkName(),wokerIdentityInfo.getTelephone());
+ }
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getLinkPhone())){
+ //鐭俊閫氱煡
+ aliSmsService.businessSendSms(Constants.smsContent.accept.getKey(),orders.getLinkPhone(),orders,null,
+ wokerIdentityInfo,categoryMapper);
+ }
}
- //鐭俊閫氱煡
- aliSmsService.businessSendSms(Constants.smsContent.accept.getKey(),member.getTelephone(),orders,null,
- wokerIdentityInfo,categoryMapper);
+
}
@@ -796,20 +802,25 @@
ordersLog.getInfo(),orders.getMember().getId(),null);
//閫氱煡鎺ュ崟浜� 璁㈠崟鍙戠敓鍙樻洿
- Member member = memberMapper.selectById(orders.getAcceptMemberId());
- //鍙戦�佸井淇￠�氱煡
- sendWxMessage.orderUpdMessage(member.getOpenid(),orders);
-
- IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
- .eq(IdentityInfo::getMemberId,member.getId())
- .eq(IdentityInfo::getType,orders.getType())
- .eq(IdentityInfo::getAuditStatus,Constants.TWO)
- .last("limit 1")
- );
- if(Objects.nonNull(wokerIdentityInfo)){
- //鐭俊閫氱煡
- aliSmsService.businessSendSms(Constants.smsContent.orderUpd.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
- null,categoryMapper);
+ Member member = memberMapper.selectById(model.getAcceptMemberId());
+ if(Objects.nonNull(member)){
+ if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getOpenid())){
+ model.setStartDate(orders.getStartDate());
+ model.setEndDate(orders.getEndDate());
+ //鍙戦�佸井淇￠�氱煡
+ sendWxMessage.orderUpdMessage(member.getOpenid(),model);
+ }
+ IdentityInfo wokerIdentityInfo = identityInfoMapper.selectOne(new QueryWrapper<IdentityInfo>().lambda()
+ .eq(IdentityInfo::getMemberId,member.getId())
+ .eq(IdentityInfo::getType,orders.getType())
+ .eq(IdentityInfo::getAuditStatus,Constants.TWO)
+ .last("limit 1")
+ );
+ if(Objects.nonNull(wokerIdentityInfo)){
+ //鐭俊閫氱煡
+ aliSmsService.businessSendSms(Constants.smsContent.orderUpd.getKey(),wokerIdentityInfo.getTelephone(),orders,null,
+ null,categoryMapper);
+ }
}
}
@@ -833,7 +844,8 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
}
- return orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2();
+ BigDecimal bigDecimalPrice = orders.getPrice().multiply(new BigDecimal(orders.getPriceNum1().toString())).multiply(new BigDecimal(orders.getPriceNum2().toString()));
+ return bigDecimalPrice.divide(new BigDecimal("1"),0,BigDecimal.ROUND_HALF_UP).longValue();//orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2();
}
@@ -1296,6 +1308,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.ZERO);
}
@@ -1691,6 +1704,10 @@
}
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());
+ }
+
this.getPriceUnit(orders);
if(orders.getStatus() <= Constants.ordersStatus.accept.getKey()){
if(Constants.equalsInteger(orders.getReleaseMemberId(),member.getId())){
@@ -1782,7 +1799,6 @@
*/
@Override
public void autoGrabOrders(){
- log.error("婊存淮婊存淮");
String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_DISPATCH).getCode();
List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda().eq(Orders::getDeleted,Constants.ZERO)
.eq(Orders::getStatus,Constants.ONE).eq(Orders::getCommentStatus,Constants.ZERO)
@@ -1793,20 +1809,20 @@
BigDecimal lat = orders.getLat();
BigDecimal lgt = orders.getLgt();
//鏌ヨ鑼冨洿鍐呯殑浼氬憳
- List<Member> memberList = memberMapper.selectList(new MPJLambdaWrapper<Member>()
- .selectAll(Member.class)
- .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)
- .select( " ifnull( (select CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( "+lgt+", "+lat+" )) /1000,DECIMAL(15,2)) from identity_info ii where ii.AUDIT_STATUS = 2 and type = 0 and ii.member_id = ID limit 1 ),0) ",Member::getDistance )
-
- .apply(" id in (" +
- " select ii.member_id from identity_info ii where ii.AUDIT_STATUS = 2 and type = '"+orders.getType()+"' " +
- " and ( CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( "+lgt+", "+lat+" )) /1000,DECIMAL(15,2))) < 100 " +
- ") ")
- .orderByDesc(Member::getLevel)
- .orderByDesc(Member::getScore)
- .orderByAsc(Member::getDistance)
- .last(" limit 1 ")
- );
+ List<Member> memberList = memberMapper.getList(lgt,lat,orders.getType());
+// 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)
+// .select( " ifnull( (select CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( "+lgt+", "+lat+" )) /1000,DECIMAL(15,2)) from identity_info ii where ii.AUDIT_STATUS = 2 and type = 0 and ii.member_id = ID limit 1 ),0) ",Member::getDistance )
+////
+// .apply(" id in (" +
+// " select ii.member_id from identity_info ii where ii.AUDIT_STATUS = 2 and type = '"+orders.getType()+"' " +
+// " and ( CONVERT( ST_Distance_Sphere ( POINT ( ii.lgt, ii.lat ), POINT ( "+lgt+", "+lat+" )) /1000,DECIMAL(15,2))) < 100 " +
+// ") ")
+// .orderByDesc(" level , score ")
+// .orderByAsc(Member::getDistance)
+// .last(" limit 1 ")
+// );
if(CollectionUtils.isEmpty(memberList)){
continue;
}
@@ -1814,7 +1830,7 @@
Member member = memberList.get(Constants.ZERO);
Member releaseMember = memberMapper.selectById(orders.getReleaseMemberId());
//鑷姩娲惧崟
- Orders model = ordersMapper.selectById(orders.getStatus());
+ Orders model = ordersMapper.selectById(orders.getId());
if(!Constants.equalsInteger(model.getStatus(),Constants.ONE)){
continue;
}
@@ -1849,8 +1865,8 @@
//閫氱煡鎺ュ崟鏂�
sendWxMessage.autoDispatchMessage(member.getOpenid(),orders,GeoUtils.haversineDistance(
orders.getLgt().doubleValue(), orders.getLat().doubleValue(),
- member.getDriverIdentityModel().getLgt().doubleValue(),
- member.getDriverIdentityModel().getLat().doubleValue()
+ wokerIdentityInfo.getLgt().doubleValue(),
+ wokerIdentityInfo.getLat().doubleValue()
));
aliSmsService.businessSendSms(Constants.smsContent.dispatch.getKey(),orders.getLinkPhone(),orders,null,
--
Gitblit v1.9.3