clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

支付调整

This commit is contained in:
HH 2022-05-11 20:10:00 +08:00
parent 98fb2c2530
commit 9f111529de
8 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java
View File

@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
@ -36,11 +35,10 @@ public class AlipayController extends BaseController {
*/
@PostMapping("qr")
public AjaxResult qrPay(String orderMasterCode) {
List<OrderMaster> orderMasters = orderMasterService.selectOrderMasterList(new OrderMaster(orderMasterCode));
if (orderMasters.isEmpty()) {
OrderMaster orderMaster = orderMasterService.selectByCode(orderMasterCode);
if (orderMaster == null) {
return AjaxResult.error("订单不存在");
}
OrderMaster orderMaster = orderMasters.get(0);
Map<String, Object> map;
try {
// TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description

10
ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
View File

@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
import java.util.Map;
@Controller
@ -44,11 +43,10 @@ public class WxPayController extends BaseController {
public AjaxResult litePay(HttpServletRequest request) {
String code = request.getParameter("code");
String orderMasterCode = request.getParameter("orderMasterCode");
List<OrderMaster> orderMasters = orderMasterService.selectOrderMasterList(new OrderMaster(orderMasterCode));
if (orderMasters.isEmpty()) {
OrderMaster orderMaster = orderMasterService.selectByCode(orderMasterCode);
if (orderMaster == null) {
return AjaxResult.error("订单不存在");
}
OrderMaster orderMaster = orderMasters.get(0);
JSONObject wxUser;
try {
wxUser = WxUtils.getOpenid(code, wxConfig.getAppId(), wxConfig.getSecret());
@ -59,7 +57,7 @@ public class WxPayController extends BaseController {
String openId = wxUser.getString("openid");
//调用adapay微信公众号支付.
WxLiteExpend expend = new WxLiteExpend();
expend.setOpen_id(openId);
expend.setOpenId(openId);
Map<String, Object> map;
try {
// TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description
@ -94,7 +92,7 @@ public class WxPayController extends BaseController {
logger.info("open id is " + openId);
//调用adapay微信公众号支付.
WxLiteExpend expend = new WxLiteExpend();
expend.setOpen_id(openId);
expend.setOpenId(openId);
Map<String, Object> map = adapayService.wxPubPay(payCallback, expend, "wxPay123456" + Math.ceil(Math.random() * 100), "1.00",
"测试商品", "测试商品detail", null, "description");
//拼接消息给前端.前端通过JSAPI调用微信支付

2
ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java
View File

@ -159,7 +159,7 @@ public class AdapayService {
}
/**
* 微信小程序支付
* 微信公众号支付
*/
public Map<String, Object> wxPubPay(PayCallback callback, WxLiteExpend expend, String orderNo, String payAmt,
String goodsTittle, String goodsDesc, String divMembers, String description) throws BaseAdaPayException {

8
ghy-common/src/main/java/com/ghy/common/adapay/callback/model/Expend.java
View File

@ -1,14 +1,10 @@
package com.ghy.common.adapay.callback.model;
import lombok.Data;
/**
* 所有支付渠道扩展参数的父类
*
* @author HH 2022/3/31
*/
@Data
public class Expend {
private String open_id;
}

7
ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java
View File

@ -49,4 +49,11 @@ public interface OrderMasterMapper {
*/
OrderMaster checkOrderMasterCodeUnique(String orderMasterCode);
/**
* 用 OrderMaster 查询主订单信息
*
* @param orderMasterCode 主订单code
* @return 主订单信息
*/
OrderMaster selectByCode(String orderMasterCode);
}

8
ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java
View File

@ -36,6 +36,14 @@ public interface OrderMasterService {
*/
OrderMaster selectById(Long orderMasterId);
/**
* 用 OrderMaster 查询主订单信息
*
* @param orderMasterCode 主订单code
* @return 主订单信息
*/
OrderMaster selectByCode(String orderMasterCode);
/**
* @param ids 主订单ids
* @return 删除结果

5
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -41,6 +41,11 @@ public class OrderMasterServiceImpl implements OrderMasterService {
return orderMasterMapper.selectById(orderMasterId);
}
@Override
public OrderMaster selectByCode(String orderMasterCode) {
return orderMasterMapper.selectByCode(orderMasterCode);
}
@Override
public int deleteOrderMasterByIds(String ids) {
Long[] orderMasterIds = Convert.toLongArray(ids);

5
ghy-order/src/main/resources/mapper/OrderMasterMapper.xml
View File

@ -133,4 +133,9 @@
WHERE `code` =#{orderMasterCode} LIMIT 1
</select>
<select id="selectByCode" parameterType="String" resultType="com.ghy.order.domain.OrderMaster">
<include refid="selectOrderMaster"/>
WHERE `code` = #{orderMasterCode}
</select>
</mapper>