diff --git a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java index b3ed06f..8553027 100644 --- a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java +++ b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java @@ -89,7 +89,7 @@ public class MpWxPayService { */ public Object createOrder(String productName, String clientIp, String productId, Integer price, String orderNo, - String openId, String body){ + String openId, String body, String notifyUrl){ WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest(); request.setDeviceInfo("WEB"); //设备号 request.setTradeType("JSAPI"); //交易类型 @@ -98,14 +98,12 @@ public class MpWxPayService { request.setDetail(productName); //商品详情 request.setTotalFee(price); //总金额|分计 request.setSpbillCreateIp(clientIp); //终端IP -// request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径 - request.setNotifyUrl("https://www.gwrx666.com/teambuy-api//teambuy/order/payOrderNotify");//设置回调路径 + request.setNotifyUrl(notifyUrl); //设置回调路径 request.setProductId(productId); //商品id request.setOpenid(openId); //JSAPI OPENID if (dev){ request.setTotalFee(price); -// request.setNotifyUrl(wxPay.notifyUrlDev); - request.setNotifyUrl("https://www.gwrx666.com/teambuy-api/teambuy/order/payOrderNotify");//设置回调路径 + request.setNotifyUrl(notifyUrl);//设置回调路径 } try { Object order = wxPayService.createOrder(request); @@ -116,51 +114,6 @@ public class MpWxPayService { } } - /** - * 微信吊起支付 - * @param productName - * @param clientIp - * @param productId - * @param price - * @param orderNo - * @param openId - * @param body - * @return - */ - public Object createOrderCashIn(String productName, String clientIp, - String productId, Integer price, String orderNo, - String openId, String body){ - WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest(); - request.setDeviceInfo("WEB"); //设备号 - request.setTradeType("JSAPI"); //交易类型 - request.setBody(productName); //商品描述 - request.setOutTradeNo(orderNo); //商户订单号 - request.setDetail(productName); //商品详情 - request.setTotalFee(price); //总金额|分计 - request.setSpbillCreateIp(clientIp); //终端IP -// request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径 - request.setNotifyUrl("http://augcl.natapp1.cc/teambuy-api/teambuy/amount/CashNotify");//设置回调路径 - request.setProductId(productId); //商品id - request.setOpenid(openId); //JSAPI OPENID - if (dev){ - request.setTotalFee(price); -// request.setNotifyUrl(wxPay.notifyUrlDev); - request.setNotifyUrl("http://augcl.natapp1.cc/teambuy-api/teambuy/amount/CashNotify");//设置回调路径 - } - try { - Object order = wxPayService.createOrder(request); - return order; - } catch (WxPayException e) { - e.printStackTrace(); - return e.getLocalizedMessage(); - } - } - - - - - - /** diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/controller/TeambuyOrderMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/controller/TeambuyOrderMemberController.java index 68b58bc..ab4a413 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/controller/TeambuyOrderMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/controller/TeambuyOrderMemberController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 团员订单表 * @Author: jeecg-boot - * @Date: 2025-05-23 + * @Date: 2025-05-24 * @Version: V1.0 */ @Api(tags="团员订单表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/entity/TeambuyOrderMember.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/entity/TeambuyOrderMember.java index 79c328a..0e2ea1f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/entity/TeambuyOrderMember.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/entity/TeambuyOrderMember.java @@ -26,7 +26,7 @@ import lombok.experimental.Accessors; /** * @Description: 团员订单表 * @Author: jeecg-boot - * @Date: 2025-05-23 + * @Date: 2025-05-24 * @Version: V1.0 */ @Data @@ -91,6 +91,10 @@ public class TeambuyOrderMember implements Serializable { @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String remark; + /**支付方式*/ + @Excel(name = "支付方式", width = 15) + @ApiModelProperty(value = "支付方式") + private java.lang.String payType; /**关联用户id*/ @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/mapper/TeambuyOrderMemberMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/mapper/TeambuyOrderMemberMapper.java index 3f3d354..623a4d7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/mapper/TeambuyOrderMemberMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/mapper/TeambuyOrderMemberMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 团员订单表 * @Author: jeecg-boot - * @Date: 2025-05-23 + * @Date: 2025-05-24 * @Version: V1.0 */ public interface TeambuyOrderMemberMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/ITeambuyOrderMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/ITeambuyOrderMemberService.java index d513487..a2e87e6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/ITeambuyOrderMemberService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/ITeambuyOrderMemberService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 团员订单表 * @Author: jeecg-boot - * @Date: 2025-05-23 + * @Date: 2025-05-24 * @Version: V1.0 */ public interface ITeambuyOrderMemberService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/impl/TeambuyOrderMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/impl/TeambuyOrderMemberServiceImpl.java index 1a650cf..2fe320a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/impl/TeambuyOrderMemberServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/impl/TeambuyOrderMemberServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 团员订单表 * @Author: jeecg-boot - * @Date: 2025-05-23 + * @Date: 2025-05-24 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/TeambuyOrderMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/TeambuyOrderMemberList.vue index a7c75b1..688cac8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/TeambuyOrderMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/TeambuyOrderMemberList.vue @@ -167,6 +167,11 @@ align:"center", dataIndex: 'remark' }, + { + title:'支付方式', + align:"center", + dataIndex: 'payType' + }, { title:'关联用户id', align:"center", @@ -220,6 +225,7 @@ fieldList.push({type:'string',value:'status',text:'订单状态',dictCode:'teambuy_status_order'}) fieldList.push({type:'string',value:'orderLeaderId',text:'关联团餐订单id',dictCode:"teambuy_order_leader,title,id"}) fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''}) + fieldList.push({type:'string',value:'payType',text:'支付方式',dictCode:''}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) fieldList.push({type:'string',value:'isDel',text:'是否删除',dictCode:'teambuy_status_del'}) this.superFieldList = fieldList diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/modules/TeambuyOrderMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/modules/TeambuyOrderMemberForm.vue index 48419cd..7fe0cec 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/modules/TeambuyOrderMemberForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/modules/TeambuyOrderMemberForm.vue @@ -48,6 +48,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue3/TeambuyOrderMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue3/TeambuyOrderMember.data.ts index fedbd26..835ca2c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue3/TeambuyOrderMember.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue3/TeambuyOrderMember.data.ts @@ -49,6 +49,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'remark' }, + { + title: '支付方式', + align:"center", + dataIndex: 'payType' + }, { title: '关联用户id', align:"center", @@ -116,6 +121,11 @@ export const formSchema: FormSchema[] = [ field: 'remark', component: 'Input', }, + { + label: '支付方式', + field: 'payType', + component: 'Input', + }, { label: '关联用户id', field: 'userId', diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/AmountController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/AmountController.java index 1443c6d..419a2c6 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/AmountController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/AmountController.java @@ -10,10 +10,7 @@ import org.jeecg.modules.apiService.LeaderService; import org.jeecg.modules.teambuyBalanceLog.entity.TeambuyBalanceLog; import org.jeecg.modules.teambuyCash.entity.TeambuyCash; import org.jeecg.modules.teambuyTeamLeader.entity.TeambuyTeamLeader; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -49,9 +46,9 @@ public class AmountController { } //充值回调 - @ApiOperation(value="钱包-充值回调", notes="钱包-充值回调") - @RequestMapping(value = "/CashNotify", method = {RequestMethod.POST}) - public Result CashNotify(String requestBody){ + @PostMapping("/CashNotify") + public Object CashNotify(@RequestBody String requestBody){ return amountService.CashNotify(requestBody); } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/CouponController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/CouponController.java index 4e5724c..1b6e83c 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/CouponController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/CouponController.java @@ -37,8 +37,8 @@ public class CouponController { //查看可领取的优惠券 @ApiOperation(value="优惠券-查看可领取的优惠券", notes="优惠券-查看可领取的优惠券") @RequestMapping(value = "/queryFetchCouponList", method = {RequestMethod.GET}) - public Result queryFetchCouponList(PageBean pageBean){ - return couponService.queryFetchCouponList(pageBean); + public Result queryFetchCouponList(@RequestHeader("X-Access-Token") String token){ + return couponService.queryFetchCouponList(token); } //获取优惠券 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java index f9f08e3..aab1354 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java @@ -103,8 +103,8 @@ public class OrderController { //创建订单 @ApiOperation(value="订单-创建订单", notes="支付方式(payType)：0-微信支付 1-余额支付") @RequestMapping(value = "/createOrder", method = {RequestMethod.POST}) - public Result createOrder(@RequestHeader("X-Access-Token") String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss, String userCouponId){ - return orderService.createOrder2(token, teambuyOrderMember, payType, leaderId, goodss, userCouponId); + public Result createOrder(@RequestHeader("X-Access-Token") String token, TeambuyOrderMember teambuyOrderMember, String leaderId, String goodss, String userCouponId){ + return orderService.createOrder2(token, teambuyOrderMember, leaderId, goodss, userCouponId); } //修改团员订单状态 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/AmountService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/AmountService.java index 17b9037..8f545a5 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/AmountService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/AmountService.java @@ -19,5 +19,5 @@ public interface AmountService { public Result queryAmountLog(String token, TeambuyBalanceLog balanceLog, PageBean pageBean); //充值回调 - public Result CashNotify(String requestBody); + Object CashNotify(String requestBody); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CouponService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CouponService.java index 844999b..6a4c367 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CouponService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CouponService.java @@ -13,7 +13,7 @@ public interface CouponService { public Result queryCouponList(String token, TeambuyCouponUser teambuyCouponUser, PageBean pageBean); //查看可领取的优惠券 - public Result queryFetchCouponList(PageBean pageBean); + public Result queryFetchCouponList(String token); //领取优惠券 public Result fetchCoupon(String token, String couponId); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java index 0d8ef26..efbb82e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java @@ -36,7 +36,7 @@ public interface OrderService { // //创建订单 // public Result createOrder(String token, TeambuyOrderMember teambuyOrderMember, String payType); //创建订单 - public Result createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss, String userCouponId); + public Result createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String leaderId, String goodss, String userCouponId); //取消团员订单 public Result deleteMemberOrderById(String token, String memberOrderId); //支付订单 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java index fa6badc..b631aa5 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java @@ -23,6 +23,7 @@ import org.jeecg.modules.teambuyTeamLeader.entity.TeambuyTeamLeader; import org.jeecg.modules.teambuyTeamLeader.service.ITeambuyTeamLeaderService; import org.jeecg.modules.teambuyTeamRelation.service.ITeambuyTeamRelationService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -32,6 +33,9 @@ import java.math.BigDecimal; @Service public class AmountServiceImpl implements AmountService { /******************************************************************************************************************/ + //支付回调地址 + @Value("${wx.miniapp.cashNotifyUrl}") + private String cashNotifyUrl; //支付接口 @Autowired private MpWxPayService mpWxPayService; @@ -59,6 +63,7 @@ public class AmountServiceImpl implements AmountService { String payNo = IdWorker.getIdStr();//生成订单号 teambuyCash.setId(payNo);//订单编号 teambuyCash.setTitle("金额充值");//订单名称 + teambuyCash.setType("0");//类型为充值 teambuyCash.setUserId(hanHaiMember.getId());//关联用户 //创建订单信息 @@ -70,14 +75,15 @@ public class AmountServiceImpl implements AmountService { String s = price.multiply(new BigDecimal(100)).toString(); int i1 = Double.valueOf(s).intValue(); - Object appOrder = mpWxPayService.createOrderCashIn( + Object appOrder = mpWxPayService.createOrder( "充值"+ productName , "127.0.0.1", teambuyCash.getId(), i1, teambuyCash.getId(), hanHaiMember.getAppletOpenid(), - teambuyCash.toString()); + teambuyCash.toString(), + cashNotifyUrl); return Result.OK("充值成功",appOrder); }catch (Exception e){ e.printStackTrace(); @@ -89,7 +95,6 @@ public class AmountServiceImpl implements AmountService { public Result queryAmountLog(String token, TeambuyBalanceLog balanceLog, PageBean pageBean) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426"); //返回信息 String massege = ""; //分页信息 @@ -138,8 +143,6 @@ public class AmountServiceImpl implements AmountService { try{ - - //查询订单信息 TeambuyCash teambuyCash = teambuyCashService.getById(outTradeNo); //如果订单存在则修改订单状态 @@ -148,6 +151,21 @@ public class AmountServiceImpl implements AmountService { teambuyCash.setStatus("1");//订单状态 teambuyCash.setPayTime(CommonUtils.getCurrentTime());//订单支付时间 teambuyCashService.updateById(teambuyCash); + + //用户余额修改 + HanHaiMember hanHaiMember = hanHaiMemberService.getById(teambuyCash.getUserId()); + BigDecimal balance = hanHaiMember.getBalance().add(teambuyCash.getAmount()); + hanHaiMember.setBalance(balance); + hanHaiMemberService.updateById(hanHaiMember); + + //添加充值日志 + TeambuyBalanceLog balanceLog = new TeambuyBalanceLog(); + balanceLog.setAmount(teambuyCash.getAmount());//充值金额 + balanceLog.setCashType("0");//收入 + balanceLog.setRecordType("1");//余额充值 + balanceLog.setUserId(teambuyCash.getUserId()); + balanceLog.setTitle("余额充值"); + teambuyBalanceLogService.save(balanceLog); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CouponServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CouponServiceImpl.java index 1de501a..7fdb6ce 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CouponServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CouponServiceImpl.java @@ -17,6 +17,8 @@ import org.jeecg.modules.teambuyCouponUser.service.ITeambuyCouponUserService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Service public class CouponServiceImpl implements CouponService { @@ -88,32 +90,49 @@ public class CouponServiceImpl implements CouponService { //查看可领取优惠券列表 @Override - public Result queryFetchCouponList(PageBean pageBean) { + public Result queryFetchCouponList(String token) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //返回信息 String massege = ""; - //分页信息 - Page page = null; - //查询信息 - LambdaQueryChainWrapper query = null; - //返回信息 - Page pageList = null; try{ - //分页 - page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - query = teambuyCouponService - .lambdaQuery(); + //获取可领取的优惠券 + List pageList = teambuyCouponService + .lambdaQuery() + .eq(TeambuyCoupon::getIsFetch, "1") + .gt(TeambuyCoupon::getValidDate, CommonUtils.getCurrentTime()) + .orderByDesc(TeambuyCoupon::getCreateTime) + .list(); - //组装查询条件 - //状态为可领取 - query.eq(TeambuyCoupon::getIsFetch, "1"); - //状态为未失效 - query.gt(TeambuyCoupon::getValidDate, CommonUtils.getCurrentTime()); - //按照创建时间降序排列 - query.orderByDesc(TeambuyCoupon::getCreateTime); + //获取已领取的优惠券 + List couponUserList = teambuyCouponUserService + .lambdaQuery() + .eq(TeambuyCouponUser::getUserId, hanHaiMember.getId()) + .list(); + + //剔除已领取的优惠券信息 + //查询已领取的优惠券信息 + List ids = new ArrayList<>(); + for (TeambuyCoupon coupon : pageList) { + for (TeambuyCouponUser teambuyCouponUser : couponUserList) { + String couponId = teambuyCouponUser.getCouponId(); + if(coupon.getId().equals(couponId)){ + ids.add(couponId); + break; + } + } + } + //剔除优惠券信息 + for (int i = 0; i < pageList.size(); i++) { + for (String id : ids) { + if(pageList.get(i).getId().equals(id)){ + pageList.remove(i); + } + } + } - //获取优惠券信息列表 - pageList = query.page(page); return Result.OK("优惠券列表", pageList); }catch (Exception e){ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java index 86f1416..3cddd7a 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java @@ -14,6 +14,8 @@ import org.jeecg.modules.apiUtils.CommonUtils; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.pay.MpWxPayService; +import org.jeecg.modules.teambuyBalanceLog.entity.TeambuyBalanceLog; +import org.jeecg.modules.teambuyBalanceLog.service.ITeambuyBalanceLogService; import org.jeecg.modules.teambuyCoupon.entity.TeambuyCoupon; import org.jeecg.modules.teambuyCouponUser.entity.TeambuyCouponUser; import org.jeecg.modules.teambuyCouponUser.service.ITeambuyCouponUserService; @@ -28,6 +30,7 @@ import org.jeecg.modules.teambuyOrderMember.service.ITeambuyOrderMemberService; import org.jeecg.modules.teambuyTeamLeader.entity.TeambuyTeamLeader; import org.jeecg.modules.teambuyTeamLeader.service.ITeambuyTeamLeaderService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -39,6 +42,9 @@ import java.util.List; @Service public class OrderServiceImpl implements OrderService { /******************************************************************************************************************/ + //支付回调地址 + @Value("${wx.miniapp.payNotifyUrl}") + private String payNotifyUrl; //支付接口 @Autowired private MpWxPayService mpWxPayService; @@ -66,6 +72,9 @@ public class OrderServiceImpl implements OrderService { //商品信息信息 @Resource private ITeambuyCouponUserService teambuyCouponUserService; + //收支信息 + @Resource + private ITeambuyBalanceLogService teambuyBalanceLogService; /******************************************************************************************************************/ //查看团餐订单列表 @Override @@ -575,9 +584,10 @@ public class OrderServiceImpl implements OrderService { //创建订单 @Override - public Result createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss, String userCouponId) { + public Result createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String leaderId, String goodss, String userCouponId) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426"); try{ if(StringUtils.isNotEmpty(userCouponId)){ @@ -659,7 +669,7 @@ public class OrderServiceImpl implements OrderService { teambuyOrderGoodsService.saveBatch(list); //订单支付 - switch (payType){ + switch (teambuyOrderMember.getPayType()){ //微信支付 case "0": //吊起微信支付 @@ -675,7 +685,8 @@ public class OrderServiceImpl implements OrderService { i1, teambuyOrderMember.getId(), hanHaiMember.getAppletOpenid(), - teambuyOrderMember.toString()); + teambuyOrderMember.toString(), + payNotifyUrl); return Result.OK("支付成功",appOrder); //余额支付 @@ -706,8 +717,19 @@ public class OrderServiceImpl implements OrderService { teambuyOrderMember.setStatus("1");//订单状态 teambuyOrderMember.setPayTime(CommonUtils.getCurrentTime());//订单支付时间 teambuyOrderMemberService.updateById(teambuyOrderMember); + + //添加消费日志 + TeambuyBalanceLog balanceLog = new TeambuyBalanceLog(); + balanceLog.setAmount(teambuyOrderMember.getPricePay());//实付金额 + balanceLog.setCashType("1");//支出 + balanceLog.setRecordType("0");//日常消费 + balanceLog.setUserId(teambuyOrderMember.getUserId()); + balanceLog.setTitle("日常消费"); + teambuyBalanceLogService.save(balanceLog); + return Result.OK("支付成功"); + } return Result.error("支付失败"); }catch (Exception e){ @@ -772,6 +794,7 @@ public class OrderServiceImpl implements OrderService { try{ //订单信息 TeambuyOrderMember teambuyOrderMember = teambuyOrderMemberService.getById(orderId); + teambuyOrderMember.setPayType(payType); //订单支付 switch (payType){ @@ -790,7 +813,8 @@ public class OrderServiceImpl implements OrderService { i1, teambuyOrderMember.getId(), hanHaiMember.getAppletOpenid(), - teambuyOrderMember.toString()); + teambuyOrderMember.toString(), + payNotifyUrl); return Result.OK("支付成功",appOrder); //余额支付 @@ -814,6 +838,16 @@ public class OrderServiceImpl implements OrderService { teambuyOrderMember.setStatus("1");//订单状态 teambuyOrderMember.setPayTime(CommonUtils.getCurrentTime());//订单支付时间 teambuyOrderMemberService.updateById(teambuyOrderMember); + + //添加消费日志 + TeambuyBalanceLog balanceLog = new TeambuyBalanceLog(); + balanceLog.setAmount(teambuyOrderMember.getPricePay());//实付金额 + balanceLog.setCashType("1");//支出 + balanceLog.setRecordType("0");//日常消费 + balanceLog.setUserId(teambuyOrderMember.getUserId()); + balanceLog.setTitle("日常消费"); + teambuyBalanceLogService.save(balanceLog); + return Result.OK("支付成功"); } @@ -848,6 +882,15 @@ public class OrderServiceImpl implements OrderService { coupon.setStatus("1"); teambuyCouponUserService.updateById(coupon); } + + //添加消费日志 + TeambuyBalanceLog balanceLog = new TeambuyBalanceLog(); + balanceLog.setAmount(teambuyOrderMember.getPricePay());//实付金额 + balanceLog.setCashType("1");//支出 + balanceLog.setRecordType("0");//日常消费 + balanceLog.setUserId(teambuyOrderMember.getUserId()); + balanceLog.setTitle("日常消费"); + teambuyBalanceLogService.save(balanceLog); } } diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index fc4da8e..78635a4 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -329,3 +329,19 @@ third-app: client-secret: ?? agent-id: ?? +## 微信商户 +wx: + miniapp: + appid: wx94a640f07969d6c9 # 微信小程序appid + secret: 7553d1ab6f599524024df1a02e27d208 # 微信小程序密钥 + merchantId: 1714087825 # 商户号 + privateKeyPath: #线上私钥证书路径 + publicKeyPath: #线上公钥证书路径 + publicKeyId: #公钥 + merchantSerialNumber: 2BC830B8E5EC7511E49B933875EF6B5B13BA4DC8 # 商户API证书序列号 + apiV3Key: 0fdb77429ffdf206c151af76a663041c # 商户APIV3密钥 +# payNotifyUrl: http://augcl.natapp1.cc/teambuy-api/teambuy/order/payOrderNotify # 线下支付回调地址 +# cashNotifyUrl: http://augcl.natapp1.cc/teambuy-api/teambuy/amount/CashNotify # 线下充值回调地址 + payNotifyUrl: https://www.gwrx666.com/teambuy-api//teambuy/order/payOrderNotify # 线下支付回调地址 + cashNotifyUrl: https://www.gwrx666.com/teambuy-api//teambuy/amount/CashNotify # 线下充值回调地址 +