From 5dfb7a8f3157da9c47577b85541661eaa17d0279 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Mon, 1 Apr 2024 12:42:35 +0800 Subject: [PATCH] update --- .../jeecg/modules/mini/controller/WxPayApiController.java | 1 + .../org/jeecg/modules/yx/controller/YxOrderController.java | 5 +++++ .../src/main/java/org/jeecg/modules/yx/entity/YxOrder.java | 1 + .../src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java | 1 + 4 files changed, 8 insertions(+) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/WxPayApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/WxPayApiController.java index 3f46616..a274ebf 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/WxPayApiController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/WxPayApiController.java @@ -190,6 +190,7 @@ public class WxPayApiController { yxOrder.setPaymentUserId(user.getId());//付款人 yxOrder.setOrderSign(jsonStr); yxOrder.setOrderStatus("1"); + yxOrder.setPaymentType("3");//微信支付 yxOrderService.save(yxOrder); //==============创建订单信息 End return Result.OK("获取成功",yxOrder.getOrderCode()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java index 179c87e..82e43ec 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; @@ -67,6 +69,9 @@ public class YxOrderController extends JeecgController @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + if (StringUtils.isNotBlank(yxOrder.getOrderCode())) { + yxOrder.setOrderCode("*"+yxOrder.getOrderCode()+"*"); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxOrder, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = yxOrderService.page(page, queryWrapper); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxOrder.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxOrder.java index 3e88c26..ea7b303 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxOrder.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxOrder.java @@ -59,6 +59,7 @@ public class YxOrder implements Serializable { /**购买用户id*/ @Excel(name = "购买用户id", width = 15) @ApiModelProperty(value = "购买用户id") + @Dict(dictTable = "sys_user",dicCode = "id",dicText = "phone") private java.lang.String paymentUserId; /**支付日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java index e185489..a5e01d8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java @@ -64,6 +64,7 @@ public class YxVipCard implements Serializable { /**兑换用户id*/ @Excel(name = "兑换用户id", width = 15) @ApiModelProperty(value = "兑换用户id") + @Dict(dictTable = "sys_user",dicCode = "id",dicText = "phone") private java.lang.String userId; /**创建人*/ @ApiModelProperty(value = "创建人")