diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchOrderController.java index ae28817c..584f9249 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchOrderController.java @@ -1,6 +1,11 @@ package com.ruoyi.web.controller.system; import java.util.List; + +import com.ruoyi.system.domain.TbUserMatch; +import com.ruoyi.system.domain.TbUserSingle; +import com.ruoyi.system.service.ITbUserMatchService; +import com.ruoyi.system.service.ITbUserSingleService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -34,6 +39,12 @@ public class TbUserMatchOrderController extends BaseController @Autowired private ITbUserMatchOrderService tbUserMatchOrderService; + @Autowired + private ITbUserSingleService tbUserSingleService; + + @Autowired + private ITbUserMatchService tbUserMatchService; + @RequiresPermissions("system:order:view") @GetMapping() public String order() @@ -51,6 +62,19 @@ public class TbUserMatchOrderController extends BaseController { startPage(); List list = tbUserMatchOrderService.selectTbUserMatchOrderList(tbUserMatchOrder); + list.forEach(order->{ + if(order.getOrderType() == 6){ + TbUserMatch tbUserMatch = tbUserMatchService.lambdaQuery().eq(TbUserMatch::getUserId, order.getUserId()).one(); + if(tbUserMatch!=null){ + order.setUserName(tbUserMatch.getNickName()); + } + }else { + TbUserSingle tbUserSingle = tbUserSingleService.lambdaQuery().eq(TbUserSingle::getUserId, order.getUserId()).one(); + if(tbUserSingle!=null){ + order.setUserName(tbUserSingle.getNickName()); + } + } + }); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserSingleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserSingleController.java index cd60a0bb..8be90954 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserSingleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserSingleController.java @@ -1,6 +1,10 @@ package com.ruoyi.web.controller.system; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; + +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -68,6 +72,33 @@ public class TbUserSingleController extends BaseController return util.exportExcel(list, "用户单身信息数据"); } + /** + * 查询字典详细 + */ + @GetMapping("/detail/{userId}") + public String detail(@PathVariable("userId") Long userId, ModelMap mmap) + { + mmap.put("userId", userId); + return "system/single/singleImg"; + } + + @PostMapping("/audit") + @ResponseBody + public AjaxResult audit(String ids, Long status){ + try { + List idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); + List userSingles = this.tbUserSingleService.lambdaQuery().in(TbUserSingle::getId, idList).list(); + userSingles.forEach(single->{ + single.setStatus(status.intValue()); + }); + return toAjax(tbUserSingleService.updateBatchById(userSingles)); + }catch (Exception e){ + logger.error(ExceptionUtils.getStackTrace(e)); + return AjaxResult.error(ExceptionUtils.getMessage(e)); + } + + } + /** * 新增用户单身信息 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/request/AdapayReq.java b/ruoyi-admin/src/main/java/com/ruoyi/web/request/AdapayReq.java index 8d801ba8..50a3ee71 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/request/AdapayReq.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/request/AdapayReq.java @@ -15,7 +15,7 @@ public class AdapayReq { private Long userId; @NotNull - @ApiModelProperty(value = "订单类型 0.初级合伙人 1.高级合伙人 2.区域合伙人") + @ApiModelProperty(value = "1:1999合伙人开通,6:9.9 户外运动交友团,7:99 本硕博学历的团,8:199 深圳有房有车的团,9:699元人工牵线") private Long orderType; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/AdapayServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/AdapayServiceImpl.java index 7ccc51f0..2987c608 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/AdapayServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/AdapayServiceImpl.java @@ -40,7 +40,22 @@ public class AdapayServiceImpl implements AdapayService { paymentParams.put("app_id", adapayConfig.getAppId()); paymentParams.put("order_no", orderNo); paymentParams.put("pay_channel", "alipay"); - paymentParams.put("pay_amt", "1999"); + if(adapayReq.getOrderType() == 6L){ +// paymentParams.put("pay_amt", "9.90"); + paymentParams.put("pay_amt", "0.01"); + }else if(adapayReq.getOrderType() == 1L){ + paymentParams.put("pay_amt", "1999.00"); + }else if(adapayReq.getOrderType() == 7L){ +// paymentParams.put("pay_amt", "99.90"); + paymentParams.put("pay_amt", "0.01"); + }else if(adapayReq.getOrderType() == 8L){ +// paymentParams.put("pay_amt", "199.00"); + paymentParams.put("pay_amt", "0.01"); + }else if(adapayReq.getOrderType() == 9L){ +// paymentParams.put("pay_amt", "699.00"); + paymentParams.put("pay_amt", "0.01"); + } + paymentParams.put("goods_title", "全民脱单合伙人开通"); paymentParams.put("goods_desc", "全民脱单合伙人资格开通"); paymentParams.put("div_members", ""); @@ -70,7 +85,17 @@ public class AdapayServiceImpl implements AdapayService { tbUserMatchOrder.setOrderNo(orderNo); tbUserMatchOrder.setPayStatus("Paying"); // 测试订单,目前均为0.01元 - tbUserMatchOrder.setOrderMoney(BigDecimal.valueOf(1999)); + if(adapayReq.getOrderType() == 6L){ + tbUserMatchOrder.setOrderMoney(BigDecimal.valueOf(9.90)); + }else if(adapayReq.getOrderType() == 1L){ + tbUserMatchOrder.setOrderMoney(BigDecimal.valueOf(1999)); + }else if(adapayReq.getOrderType() == 7L){ + tbUserMatchOrder.setOrderMoney(BigDecimal.valueOf(99)); + }else if(adapayReq.getOrderType() == 8L){ + tbUserMatchOrder.setOrderMoney(BigDecimal.valueOf(199)); + }else if(adapayReq.getOrderType() == 9L){ + tbUserMatchOrder.setOrderMoney(BigDecimal.valueOf(699)); + } tbUserMatchOrderService.insertTbUserMatchOrder(tbUserMatchOrder); return resp; } diff --git a/ruoyi-admin/src/main/resources/templates/system/order/order.html b/ruoyi-admin/src/main/resources/templates/system/order/order.html index 9626bf3b..5fe7b18b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/order/order.html +++ b/ruoyi-admin/src/main/resources/templates/system/order/order.html @@ -58,6 +58,8 @@ + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatchOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatchOrder.java index 88625789..720b1dde 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatchOrder.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatchOrder.java @@ -3,6 +3,7 @@ package com.ruoyi.system.domain; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -32,6 +33,9 @@ public class TbUserMatchOrder extends BaseEntity @Excel(name = "用户id") private Long userId; + @TableField(exist = false) + private String userName; + /** 订单类型 0.初级 1.高级 2.区域 */ @Excel(name = "订单类型 0.初级 1.高级 2.区域") private Long orderType;