backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

拉卡拉支付增加接口

Browse Source
This commit is contained in:
Jack 2025-01-18 00:59:35 +08:00
parent db71764d8a
commit a31bee549d
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mall-common/src/main/java/com/suisung/mall/common/modules/sync/SyncApp.java
View File

@ -33,9 +33,6 @@ public class SyncApp implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Long id; private Long id;
@ApiModelProperty(value = "app id")
private String app_id;
@ApiModelProperty(value = "app key") @ApiModelProperty(value = "app key")
private String app_key; private String app_key;

3
mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java
View File

@ -243,10 +243,11 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
List<String> trade_titles = trade_rows.stream().map(PayConsumeTrade::getTrade_title).distinct().collect(Collectors.toList()); List<String> trade_titles = trade_rows.stream().map(PayConsumeTrade::getTrade_title).distinct().collect(Collectors.toList());
trade_row.setTrade_title(CollUtil.join(trade_titles, ",")); trade_row.setTrade_title(CollUtil.join(trade_titles, ","));
// 付款金额 // 多条付款金额累加
BigDecimal payment_amount = trade_rows.stream().map(PayConsumeTrade::getTrade_payment_amount).reduce(BigDecimal::add).get(); BigDecimal payment_amount = trade_rows.stream().map(PayConsumeTrade::getTrade_payment_amount).reduce(BigDecimal::add).get();
trade_row.setTrade_payment_amount(payment_amount); trade_row.setTrade_payment_amount(payment_amount);
if (payment_amount.compareTo(BigDecimal.ZERO) > 0) { if (payment_amount.compareTo(BigDecimal.ZERO) > 0) {
// 订单金额大于0的情况
List<Integer> order_state_ids = trade_rows.stream().map(PayConsumeTrade::getOrder_state_id).distinct().collect(Collectors.toList()); List<Integer> order_state_ids = trade_rows.stream().map(PayConsumeTrade::getOrder_state_id).distinct().collect(Collectors.toList());
if (!order_state_ids.contains(StateCode.ORDER_STATE_CANCEL)) { if (!order_state_ids.contains(StateCode.ORDER_STATE_CANCEL)) {
trade_row.setTrade_title(I18nUtil._("在线购物")); trade_row.setTrade_title(I18nUtil._("在线购物"));

14
mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/SyncThirdDataController.java
View File

@ -31,25 +31,25 @@ public class SyncThirdDataController {
@ApiOperation(value = "商品分类数据同步", notes = "商品分类数据同步") @ApiOperation(value = "商品分类数据同步", notes = "商品分类数据同步")
@RequestMapping(value = "/goods/category", method = RequestMethod.POST) @RequestMapping(value = "/goods/category", method = RequestMethod.POST)
public ThirdApiRes syncGoodsCategory(HttpServletRequest request, public ThirdApiRes syncGoodsCategory(HttpServletRequest request,
@RequestParam String appId, @RequestParam String appKey,
@RequestParam String sign, @RequestParam String sign,
@RequestBody JSONArray categoryListJSON) { @RequestBody JSONArray categoryListJSON) {
return syncThirdDataService.saveOrUpdateShopBaseProductCategoryBatch(appId, sign, categoryListJSON); return syncThirdDataService.saveOrUpdateShopBaseProductCategoryBatch(appKey, sign, categoryListJSON);
} }
@ApiOperation(value = "商品品牌数据同步", notes = "商品品牌数据同步") @ApiOperation(value = "商品品牌数据同步", notes = "商品品牌数据同步")
@RequestMapping(value = "/goods/brand", method = RequestMethod.POST) @RequestMapping(value = "/goods/brand", method = RequestMethod.POST)
public ThirdApiRes syncGoodsBrand(HttpServletRequest request, public ThirdApiRes syncGoodsBrand(HttpServletRequest request,
@RequestParam String appId, @RequestParam String appKey,
@RequestParam String sign, @RequestParam String sign,
@RequestBody JSONArray brandListJSON) { @RequestBody JSONArray brandListJSON) {
return syncThirdDataService.saveOrUpdateShopBaseProductBrandBatch(appId, sign, brandListJSON); return syncThirdDataService.saveOrUpdateShopBaseProductBrandBatch(appKey, sign, brandListJSON);
} }
@ApiOperation(value = "商品辅助属性数据同步", notes = "商品辅助属性数据同步") @ApiOperation(value = "商品辅助属性数据同步", notes = "商品辅助属性数据同步")
@RequestMapping(value = "/goods/assist", method = RequestMethod.POST) @RequestMapping(value = "/goods/assist", method = RequestMethod.POST)
public ThirdApiRes syncGoodsAssist(HttpServletRequest request, public ThirdApiRes syncGoodsAssist(HttpServletRequest request,
@RequestParam String appId, @RequestParam String appKey,
@RequestParam String sign, @RequestParam String sign,
@RequestBody String reqBody) { @RequestBody String reqBody) {
return null; return null;
@ -58,7 +58,7 @@ public class SyncThirdDataController {
@ApiOperation(value = "商品数据同步", notes = "商品数据同步") @ApiOperation(value = "商品数据同步", notes = "商品数据同步")
@RequestMapping(value = "/goods", method = RequestMethod.POST) @RequestMapping(value = "/goods", method = RequestMethod.POST)
public ThirdApiRes syncGoods(HttpServletRequest request, public ThirdApiRes syncGoods(HttpServletRequest request,
@RequestParam String appId, @RequestParam String appKey,
@RequestParam String sign, @RequestParam String sign,
@RequestBody String reqBody) { @RequestBody String reqBody) {
return null; return null;
@ -67,7 +67,7 @@ public class SyncThirdDataController {
@ApiOperation(value = "会员数据同步", notes = "会员数据同步") @ApiOperation(value = "会员数据同步", notes = "会员数据同步")
@RequestMapping(value = "/member", method = RequestMethod.POST) @RequestMapping(value = "/member", method = RequestMethod.POST)
public ThirdApiRes syncMember(HttpServletRequest request, public ThirdApiRes syncMember(HttpServletRequest request,
@RequestParam String appId, @RequestParam String appKey,
@RequestParam String sign, @RequestParam String sign,
@RequestBody List<SyncThirdMemberReq> memberList) { @RequestBody List<SyncThirdMemberReq> memberList) {
return null; return null;