From b8bf9a10ca1c65e94d75a2db5550e6263b582512 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 十二月 2024 15:01:41 +0800
Subject: [PATCH] 调整结果项目状态判断结论增加非空判断
---
ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxMallOrderController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxMallOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxMallOrderController.java
index 84c7cd8..25f7d17 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxMallOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/WxMallOrderController.java
@@ -2,6 +2,8 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
@@ -17,6 +19,7 @@
import com.google.common.base.Joiner;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.exception.user.DataNotFoundException;
+import com.ltkj.common.task.TaskService;
import com.ltkj.common.utils.IpUtil;
import com.ltkj.common.utils.JacksonUtil;
import com.ltkj.framework.config.UserHoder;
@@ -29,6 +32,7 @@
import com.ltkj.mall.mallOrderUtils.OrderUtil;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.web.config.redis.OrderDelayService;
+import com.ltkj.web.wxUtils.WxUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -81,7 +85,8 @@
private WxPayService wxPayService;
@Resource
private ITbTransitionService transitionService;
-
+ @Autowired
+ private TaskService taskService;
@Resource
private OrderDelayService delayService;
@@ -399,7 +404,6 @@
/**
* 寰俊浠樻鎴愬姛鎴栧け璐ュ洖璋冩帴鍙�
* <p>
- * TODO
* 娉ㄦ剰锛岃繖閲宲ay-notify鏄ず渚嬪湴鍧�锛屽缓璁紑鍙戣�呭簲璇ヨ绔嬩竴涓殣钄界殑鍥炶皟鍦板潃
*
* @param request 璇锋眰鍐呭
@@ -465,6 +469,53 @@
// final MallTimeConfig one = mallTimeConfigService.getOne(wq);
// one.setNowNum(one.getNowNum()-1);
// mallTimeConfigService.updateById(one);
+ //鍙戣鍗曚俊鎭粰wx璁㈤槄鏈嶅姟娑堟伅鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�攕tart鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
+
+ Map<String, Object> res = new HashMap<>();
+ res.put("touser",UserHoder.getWxuser().getOpenid());
+ res.put("template_id","Gzc2BgzSsEY9uki6FThNQRLD1_An6uqpSve3PaU58PQ");
+ res.put("page","pages/mine/index");
+ res.put("miniprogram_state","formal");
+ //璁㈤槄娑堟伅鍙傛暟鍊�
+ JSONObject data = new JSONObject();
+
+ JSONObject amount3 = new JSONObject();
+ amount3.put("value", order.getOrderSn());
+ data.put("character_string2", amount3);
+
+ JSONObject time4 = new JSONObject();
+ String dateFormat = DateUtil.format(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+ time4.put("value", dateFormat);
+ data.put("time1", time4);
+
+ final TjPackage byId = packageService.getById(order.getPacId());
+ if (byId!=null){
+ JSONObject thing5 = new JSONObject();
+ thing5.put("value",byId.getPacName());
+ data.put("thing3", thing5);
+ }else {
+ JSONObject thing5 = new JSONObject();
+ thing5.put("value","浣撴椤圭洰");
+ data.put("thing3", thing5);
+ }
+
+ JSONObject name1 = new JSONObject();
+ name1.put("value",order.getActualPrice()+"鍏�");
+ data.put("amount4", name1);
+
+ if (order.getPayId()!=null){
+ JSONObject thing6 = new JSONObject();
+ thing6.put("value", "宸蹭粯娆�");
+ data.put("phrase8", thing6);
+ }else {
+ JSONObject thing6 = new JSONObject();
+ thing6.put("value", "鏈粯娆�");
+ data.put("phrase8", thing6);
+ }
+
+ WxUtil.sendCommonSubscribeMessage(res,data);
+ //鍙戣鍗曚俊鎭粰wx璁㈤槄鏈嶅姟娑堟伅鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�攅nd鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��
+
return AjaxResult.success();
}
@@ -562,9 +613,6 @@
return AjaxResult.error("璁㈠崟閫�娆惧け璐�");
}
}
- //TODO 鍙戦�侀偖浠跺拰鐭俊閫氱煡锛岃繖閲岄噰鐢ㄥ紓姝ュ彂閫�
- // 閫�娆炬垚鍔熼�氱煡鐢ㄦ埛, 渚嬪鈥滄偍鐢宠鐨勮鍗曢��娆� [ 鍗曞彿:{1} ] 宸叉垚鍔燂紝璇疯�愬績绛夊緟鍒拌处銆傗��
- // 娉ㄦ剰璁㈠崟鍙峰彧鍙戝悗6浣�
/*notifyService.notifySmsTemplate(order.getMobile(), NotifyType.REFUND,
new String[]{order.getOrderSn().substring(8, 14)});*/
orderService.updateById(order);
--
Gitblit v1.8.0