zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/17/head
Jruome 2023-06-16 15:12:59 +08:00
parent 7910334283 1813516c54
commit e85f2e75a7
4 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
View File

@ -1320,8 +1320,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
});
phoneRecordMapper.insertBatch(recordDOS);
try {
// 用于支付测试 TODO
// phoneRecordService.insertPhone(phoneRecordAdds);
phoneRecordService.insertPhone(phoneRecordAdds);
} catch (Exception e) {
log.info("调取提报新增报错{}", e);
}

44
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/support/pay/WxPayStrategy.java
View File

@ -47,28 +47,28 @@ public class WxPayStrategy implements IPayStrategy{
Long requiredTenantId = TenantContextHolder.getRequiredTenantId();
TenantDTO tenant = tenantApi.getTenant(requiredTenantId);
InitOrderResponse response = new InitOrderResponse();
// WxPayService wxPayService = wxPayOneAutoConfiguration.wxPayOneService();
// Assert.notNull(wxPayService, "获取微信支付配置失败!");
// WxPayUnifiedOrderV3Request wxPayRequest = new WxPayUnifiedOrderV3Request();
// int sum = orderDO.getPayPrice().multiply(new BigDecimal("100")).intValue();
// wxPayRequest.setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(sum));
// wxPayRequest.setDescription(tenant.getName());
// wxPayRequest.setOutTradeNo(orderDO.getOrderId());
// wxPayRequest.setNotifyUrl(payProperties.getNotifyUrl());
// wxPayRequest.setPayer(new WxPayUnifiedOrderV3Request.Payer().setOpenid(openid));
// wxPayRequest.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(ServletUtils.getClientIP(servletRequest)));
// wxPayRequest.setAppid(payProperties.getAppId());
// wxPayRequest.setMchid(payProperties.getMchId());
// try {
// WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result = wxPayService.unifiedOrderV3(TradeTypeEnum.JSAPI, wxPayRequest);
// WxPayUnifiedOrderV3Result.JsapiResult jsapiResult = wxPayUnifiedOrderV3Result.getPayInfo(TradeTypeEnum.JSAPI, payProperties.getAppId(), payProperties.getMchId(), wxPayService.getConfig().getPrivateKey());
// InitOrderResponse.JsapiResult jsapiResultNew = new InitOrderResponse.JsapiResult();
// BeanUtils.copyProperties(jsapiResult, jsapiResultNew);
// response.setJsapiResult(jsapiResultNew);
// BeanUtils.copyProperties(wxPayUnifiedOrderV3Result, response);
// } catch (Exception e) {
// log.error(e.getMessage());
// }
WxPayService wxPayService = wxPayOneAutoConfiguration.wxPayOneService();
Assert.notNull(wxPayService, "获取微信支付配置失败!");
WxPayUnifiedOrderV3Request wxPayRequest = new WxPayUnifiedOrderV3Request();
int sum = orderDO.getPayPrice().multiply(new BigDecimal("100")).intValue();
wxPayRequest.setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(sum));
wxPayRequest.setDescription(tenant.getName());
wxPayRequest.setOutTradeNo(orderDO.getOrderId());
wxPayRequest.setNotifyUrl(payProperties.getNotifyUrl());
wxPayRequest.setPayer(new WxPayUnifiedOrderV3Request.Payer().setOpenid(openid));
wxPayRequest.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(ServletUtils.getClientIP(servletRequest)));
wxPayRequest.setAppid(payProperties.getAppId());
wxPayRequest.setMchid(payProperties.getMchId());
try {
WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result = wxPayService.unifiedOrderV3(TradeTypeEnum.JSAPI, wxPayRequest);
WxPayUnifiedOrderV3Result.JsapiResult jsapiResult = wxPayUnifiedOrderV3Result.getPayInfo(TradeTypeEnum.JSAPI, payProperties.getAppId(), payProperties.getMchId(), wxPayService.getConfig().getPrivateKey());
InitOrderResponse.JsapiResult jsapiResultNew = new InitOrderResponse.JsapiResult();
BeanUtils.copyProperties(jsapiResult, jsapiResultNew);
response.setJsapiResult(jsapiResultNew);
BeanUtils.copyProperties(wxPayUnifiedOrderV3Result, response);
} catch (Exception e) {
log.error(e.getMessage());
}
return response;
}

2
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/order/StoreOrderMapper.xml
View File

@ -77,7 +77,7 @@
`cy_recharge_order_info` info
LEFT JOIN cy_recharge_order ord ON info.recharge_order_id = ord.id
WHERE
ord.paid = 1
ord.paid != 0
<if test="null != startTime">
and info.create_time >= #{startTime}
</if>

2
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
View File

@ -252,7 +252,7 @@
and b.nickname like CONCAT('%',#{data.nickname},'%')
</if>
<if test="data.realName !=null and data.realName!=''">
and x.real_name like CONCAT('%',#{data.realName},'%')
and x.nickname like CONCAT('%',#{data.realName},'%')
</if>
<if test="data.userPhone !=null and data.userPhone!=''">
and a.user_phone like CONCAT('%',#{data.userPhone},'%')