diff --git a/doc/~$系统运行简易教程.docx b/doc/~$系统运行简易教程.docx new file mode 100644 index 0000000..eb358bb Binary files /dev/null and b/doc/~$系统运行简易教程.docx differ diff --git a/doc/商城系统运行简易教程.docx b/doc/商城系统运行简易教程.docx index dee0ace..b407efd 100644 Binary files a/doc/商城系统运行简易教程.docx and b/doc/商城系统运行简易教程.docx differ diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/PayController.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/PayController.java index e498b57..49d0a41 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/PayController.java +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/PayController.java @@ -6,11 +6,22 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; +import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult; +import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; +import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.service.WxPayService; import com.itmuch.lightsecurity.jwt.UserOperator; import com.ruoyi.app.common.R; +import com.ruoyi.app.common.persistence.dao.StoreGoodsMapper; +import com.ruoyi.app.common.persistence.dao.StoreOrderGoodsMapper; +import com.ruoyi.app.common.persistence.model.StoreMember; import com.ruoyi.app.common.persistence.model.StoreOrder; +import com.ruoyi.app.common.persistence.model.StoreOrderGoods; +import com.ruoyi.app.modular.member.service.IMemberService; import com.ruoyi.app.modular.shop.service.dto.OrderDTO; import com.ruoyi.app.modular.shop.service.impl.OrderServiceImpl; import io.swagger.annotations.Api; @@ -19,11 +30,15 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import javax.sound.midi.SoundbankResource; +import java.math.BigDecimal; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -40,6 +55,8 @@ public class PayController { private final UserOperator userOperator; private final OrderServiceImpl orderService; private final WxPayService wxPayService; + private final IMemberService memberService; + private final StoreOrderGoodsMapper storeOrderGoodsMapper; @PostMapping(value = "/shop/pay-confirm-money") @ApiOperation(value = "支付前检测获取的价格",notes = "支付前检测获取的价格") @@ -60,10 +77,16 @@ public class PayController { return R.success(map); } + /** + * 调用统一下单接口，并组装生成支付所需参数对象. + * + * @param request 统一下单请求参数 + * @param 请使用{@link com.github.binarywang.wxpay.bean.order}包下的类 + * @return 返回 {@link com.github.binarywang.wxpay.bean.order}包下的类对象 + */ @PostMapping(value = "/shop/pay-do-pay") @ApiOperation(value = "开始支付",notes = "开始支付") - public R doPay(@Validated @RequestBody String jsonStr, - WxPayUnifiedOrderRequest orderRequest){ + public R doPay(@Validated @RequestBody String jsonStr){ JSONObject jsonObject = JSON.parseObject(jsonStr); String orderNo = jsonObject.get("order_no").toString(); //1-余额支付 2-微信支付 @@ -87,31 +110,70 @@ public class PayController { orderService.payYue(storeOrder); return R.success("余额支付成功"); }else{ - return R.error(4000,"微信支付开发中"); - //todo 微信支付 -// try { -// //WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest(); -// orderRequest.setBody("主题"); -// orderRequest.setOutTradeNo("订单号"); -// orderRequest.setTotalFee(1);//元转成分 -// orderRequest.setOpenid("openId"); -// orderRequest.setSpbillCreateIp("userIp"); -// //orderRequest.setTimeStart("yyyyMMddHHmmss"); -// // orderRequest.setTimeExpire("yyyyMMddHHmmss"); -// -// return R.success(wxPayService.createOrder(orderRequest)); -// } catch (Exception e) { -// log.error("微信支付失败！订单号：{},原因:{}", orderNo, e.getMessage()); -// e.printStackTrace(); -// return R.error(4000,"支付失败，请稍后重试！"); -// } + //判断库存 + QueryWrapper wrapperGoods = new QueryWrapper<>(); + wrapperGoods.eq("order_id",storeOrder.getOrderId()); + List orderGoodsList = storeOrderGoodsMapper + .selectList(wrapperGoods); + for (StoreOrderGoods storeGood : orderGoodsList) { + int storeCount = orderService.checkStore(storeGood.getGoodsId(),storeGood.getSpecKey()); + if(storeCount < storeGood.getGoodsNum()){ + return R.error(4000,"库存不足"); + } + } + //System.out.println("11111"); + WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest(); + StoreMember member = memberService.getById(userId); + orderRequest.setBody("商品购买"); + orderRequest.setOutTradeNo(orderNo); + BigDecimal bigDecimal = new BigDecimal(100); + orderRequest.setTotalFee(bigDecimal.multiply(storeOrder.getOrderAmount()).intValue());//元转成分 + orderRequest.setOpenid(member.getOpenid()); + orderRequest.setSpbillCreateIp("127.0.0.1"); + orderRequest.setNotifyUrl("https://app2.dayouqiantu.cn/shop/notify"); + orderRequest.setTradeType("JSAPI"); + try { + WxPayMpOrderResult orderResult = wxPayService.createOrder(orderRequest); + System.out.println(orderResult); + return R.success(orderResult); + } catch (WxPayException e) { + return R.error(4000,e.getMessage()); + //e.printStackTrace(); + } } - // return R.success(""); + + } + + @PostMapping(value = "/shop/notify") + @ApiOperation(value = "异步通知",notes = "异步通知") + public String payNotify(@RequestBody String xmlData){ + try { + WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData); + String orderNo = notifyResult.getOutTradeNo(); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("deleted",0).eq("pay_status",0).eq("order_sn",orderNo); + StoreOrder storeOrder = orderService.getOne(wrapper); + if(ObjectUtil.isNull(storeOrder)) { + return WxPayNotifyResponse.success("处理成功!"); + } + orderService.notifyHandle(storeOrder); + return WxPayNotifyResponse.success("处理成功!"); + } catch (WxPayException e) { + //System.out.println(e.getMessage()); + log.error(e.getMessage()); + return WxPayNotifyResponse.fail(e.getMessage()); + } + + + // return WxPayNotifyResponse.success("处理成功!"); + } + + } diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IOrderService.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IOrderService.java index fd9d6ad..53bcd31 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IOrderService.java +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IOrderService.java @@ -40,4 +40,6 @@ public interface IOrderService extends IService { public void payYue(StoreOrder order); + public void notifyHandle(StoreOrder order); + } diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/OrderServiceImpl.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/OrderServiceImpl.java index 4159b23..6f3e43a 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/OrderServiceImpl.java +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/OrderServiceImpl.java @@ -482,6 +482,48 @@ public class OrderServiceImpl extends ServiceImpl return storeOrder; } + /** + * 订单处理 + * @param order + */ + @Override + @Transactional + public void notifyHandle(StoreOrder order) { + QueryWrapper wrapperGoods = new QueryWrapper<>(); + wrapperGoods.eq("order_id",order.getOrderId()); + List orderGoodsList = storeOrderGoodsMapper + .selectList(wrapperGoods); + for (StoreOrderGoods storeGood : orderGoodsList) { + //更新库存 + storeSpecGoodsPriceMapper.decCount(storeGood.getGoodsId(), + storeGood.getSpecKey(),storeGood.getGoodsNum()); + //增加商品销量 + storeGoodsMapper.incSaleNum(storeGood.getGoodsId() + ,storeGood.getGoodsNum()); + + } + + //更新订单状态 + StoreOrder storeOrder = new StoreOrder(); + storeOrder.setOrderId(order.getOrderId()); + storeOrder.setPayStatus(1); + storeOrder.setPayMethod(1); + storeOrder.setUserMoney(order.getOrderAmount()); + storeOrder.setPayTime(OrderUtil.getSecondTimestampTwo()); + updateById(storeOrder); + + //增加流水 + StorePointsMoneyLog storePointsMoneyLog = new StorePointsMoneyLog(); + storePointsMoneyLog.setUserId(order.getUserId()); + storePointsMoneyLog.setTitle("购买商品"); + storePointsMoneyLog.setMoneyNumber(order.getOrderAmount()); + storePointsMoneyLog.setType(2); + storePointsMoneyLog.setCreateTime(OrderUtil.getSecondTimestampTwo()); + + storePointsMoneyLogMapper.insert(storePointsMoneyLog); + + } + /** * 余额支付 */ @@ -541,4 +583,8 @@ public class OrderServiceImpl extends ServiceImpl storePointsMoneyLogMapper.insert(storePointsMoneyLog); } + + + + } diff --git a/ruoyi-api/src/main/resources/application.yml b/ruoyi-api/src/main/resources/application.yml index 0448095..8be212a 100644 --- a/ruoyi-api/src/main/resources/application.yml +++ b/ruoyi-api/src/main/resources/application.yml @@ -6,6 +6,9 @@ light-security: - http-method: ANY path: /oauth/access_token expression: "anon()" + - http-method: ANY + path: /shop/notify + expression: "anon()" - http-method: get path: /doc.html expression: "anon()" @@ -150,8 +153,8 @@ wx: subMchId: keyPath: miniapp: - appid: wx604d2ea4702620d2 - secret: 0beb4dad95fbd97cbaf2a0a4dec51575 + appid: + secret: token: aesKey: msgDataFormat: JSON \ No newline at end of file