yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
zhouwentao 2024-04-01 12:42:35 +08:00
parent f4cb3827ad
commit 5dfb7a8f31
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/WxPayApiController.java
View File

@ -190,6 +190,7 @@ public class WxPayApiController {
yxOrder.setPaymentUserId(user.getId());//付款人 yxOrder.setPaymentUserId(user.getId());//付款人
yxOrder.setOrderSign(jsonStr); yxOrder.setOrderSign(jsonStr);
yxOrder.setOrderStatus("1"); yxOrder.setOrderStatus("1");
yxOrder.setPaymentType("3");//微信支付
yxOrderService.save(yxOrder); yxOrderService.save(yxOrder);
//==============创建订单信息 End //==============创建订单信息 End
return Result.OK("获取成功",yxOrder.getOrderCode()); return Result.OK("获取成功",yxOrder.getOrderCode());

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxOrderController.java
View File

@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
@ -67,6 +69,9 @@ public class YxOrderController extends JeecgController<YxOrder, IYxOrderService>
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
if (StringUtils.isNotBlank(yxOrder.getOrderCode())) {
yxOrder.setOrderCode("*"+yxOrder.getOrderCode()+"*");
}
QueryWrapper<YxOrder> queryWrapper = QueryGenerator.initQueryWrapper(yxOrder, req.getParameterMap()); QueryWrapper<YxOrder> queryWrapper = QueryGenerator.initQueryWrapper(yxOrder, req.getParameterMap());
Page<YxOrder> page = new Page<YxOrder>(pageNo, pageSize); Page<YxOrder> page = new Page<YxOrder>(pageNo, pageSize);
IPage<YxOrder> pageList = yxOrderService.page(page, queryWrapper); IPage<YxOrder> pageList = yxOrderService.page(page, queryWrapper);

1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxOrder.java
View File

@ -59,6 +59,7 @@ public class YxOrder implements Serializable {
/**购买用户id*/ /**购买用户id*/
@Excel(name = "购买用户id", width = 15) @Excel(name = "购买用户id", width = 15)
@ApiModelProperty(value = "购买用户id") @ApiModelProperty(value = "购买用户id")
@Dict(dictTable = "sys_user",dicCode = "id",dicText = "phone")
private java.lang.String paymentUserId; private java.lang.String paymentUserId;
/**支付日期*/ /**支付日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java
View File

@ -64,6 +64,7 @@ public class YxVipCard implements Serializable {
/**兑换用户id*/ /**兑换用户id*/
@Excel(name = "兑换用户id", width = 15) @Excel(name = "兑换用户id", width = 15)
@ApiModelProperty(value = "兑换用户id") @ApiModelProperty(value = "兑换用户id")
@Dict(dictTable = "sys_user",dicCode = "id",dicText = "phone")
private java.lang.String userId; private java.lang.String userId;
/**创建人*/ /**创建人*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")