Просмотр исходного кода

//tt product

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
ee244aa886
3 измененных файлов: 41 добавлений и 7 удалений
  1. +28
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java
  3. +12
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 28
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java Просмотреть файл

@@ -100,10 +100,11 @@ public class WxPayOrderController extends BaseController {
return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号");
} }
return _create(orderIdStr,composeOrderType,user.getUserId(),getPayWay(),user.getAppId(),new PayExtraParam("openId",user.getOpenId()),request);
return _create(orderIdStr,composeOrderType,user.getUserId(),getPayWay(),user.getAppId(),new PayExtraParam("openId",user.getOpenId()),true,request);
} }
private ResultData _create(String orderIdStr,String composeOrderType,Long userId, EnumPayWay payWay,String appId,PayExtraParam parm,HttpServletRequest request) {
private ResultData _create(String orderIdStr,String composeOrderType,Long userId, EnumPayWay payWay,
String appId,PayExtraParam parm,boolean isCreatePay,HttpServletRequest request) {
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(userId,getFinalTenantId()); WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(userId,getFinalTenantId());
if ( null == wxCUserBasicInfo) { if ( null == wxCUserBasicInfo) {
logger.error("会员用户不存在."+userId); logger.error("会员用户不存在."+userId);
@@ -128,7 +129,7 @@ public class WxPayOrderController extends BaseController {
try { try {
record.setIp(IPUtil.getIpAddr(request)); record.setIp(IPUtil.getIpAddr(request));
record.setComposeOrder(Integer.parseInt(composeOrderType)); record.setComposeOrder(Integer.parseInt(composeOrderType));
return wxPayOrderService.createPayOrder(appInfo, wxCUserBasicInfo, record, payWay,parm);
return wxPayOrderService.createPayOrder(appInfo, wxCUserBasicInfo, record, payWay,parm,isCreatePay);
} catch (MallinkException e) { } catch (MallinkException e) {
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage(),e); logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage(),e);
return new ResultData(e.getErrorCode(), e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage());
@@ -138,6 +139,30 @@ public class WxPayOrderController extends BaseController {
} }
} }


@RequestMapping(value = "/ttcreatev2", method = RequestMethod.POST)
public ResultData _ttcreatev2(@RequestBody Map<String, String> paramMap, HttpServletRequest request) throws Exception {
logger.info("/api/pay/create" + paramMap.toString());
String orderIdStr = paramMap.get("orderId");
if (StringUtils.isBlank(orderIdStr)) {
logger.info("orderId不能为空: " + paramMap.toString());
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空");
}

String composeOrderType = paramMap.get("composeOrderType");
if (StringUtils.isBlank(composeOrderType)) {
logger.info("composeOrderType不能为空: " + paramMap.toString());
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "composeOrderType不能为空");
}

CUser user = getCUser();
if (!user.basicInfoIs()) {
logger.error("暂未成为会员,请授权手机号");
return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号");
}

return _create(orderIdStr,composeOrderType,user.getUserId(),getPayWay(),user.getAppId(),new PayExtraParam("openId",user.getOpenId()),false,request);
}

@ApiOperation(value = "更新支付订单状态", notes = "{\"payOrderId\":\"string\",\"composeOrderId\":\"string\",\"status\":integer,\"reason\":\"string\"}") @ApiOperation(value = "更新支付订单状态", notes = "{\"payOrderId\":\"string\",\"composeOrderId\":\"string\",\"status\":integer,\"reason\":\"string\"}")
@PostMapping("/updatePayOrder") @PostMapping("/updatePayOrder")
public ResultData updatePayOrder(@RequestBody Map<String, Object> paramMap) { public ResultData updatePayOrder(@RequestBody Map<String, Object> paramMap) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java Просмотреть файл

@@ -34,7 +34,7 @@ public interface WxPayOrderService {
* @param payWay * @param payWay
* @return * @return
*/ */
ResultData createPayOrder(WxAppinfo appInfo, WxCUserBasicInfo user, WxPayOrder record, EnumPayWay payWay,PayExtraParam params);
ResultData createPayOrder(WxAppinfo appInfo, WxCUserBasicInfo user, WxPayOrder record, EnumPayWay payWay,PayExtraParam params,boolean isCreatePay);


/** /**
* 刷卡支付订单 * 刷卡支付订单


+ 12
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Просмотреть файл

@@ -229,7 +229,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
} }
@Override @Override
public ResultData createPayOrder(WxAppinfo appInfo, WxCUserBasicInfo user, WxPayOrder record, EnumPayWay payWay,PayExtraParam params) {
public ResultData createPayOrder(WxAppinfo appInfo, WxCUserBasicInfo user, WxPayOrder record, EnumPayWay payWay,PayExtraParam params,boolean isCreatePay) {
/* /*
* 如果是组合订单(非拼团、砍价),则结算按照主订单来结算。 * 如果是组合订单(非拼团、砍价),则结算按照主订单来结算。
* //如果是组合订单,则wxPayOrder对应的是WxcomposeOrder.为了兼容之前的,需要把支付相关信息也保存到子订单里面去 * //如果是组合订单,则wxPayOrder对应的是WxcomposeOrder.为了兼容之前的,需要把支付相关信息也保存到子订单里面去
@@ -248,7 +248,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
lastCoupon = checkSinglePayOrder(o, user, payWay); lastCoupon = checkSinglePayOrder(o, user, payWay);
} }
String productName = orderAdapterService.getPayProductName(lastCoupon); String productName = orderAdapterService.getPayProductName(lastCoupon);
PayAdapterResult payResult = createPayOrder(appInfo, user, record,composeOrder,productName, payWay, params);
PayAdapterResult payResult = createPayOrder(appInfo, user, record,composeOrder,productName, payWay, params,isCreatePay);
if (payResult.isSuccess()) { if (payResult.isSuccess()) {
// wxOrderService.sendInsideOrderPushMsg(composeOrder,composeOrder.getMainOrderId()); // wxOrderService.sendInsideOrderPushMsg(composeOrder,composeOrder.getMainOrderId());
return new ResultData(Result.SUCCESS,"创建支付单成功",payResult.getData()); return new ResultData(Result.SUCCESS,"创建支付单成功",payResult.getData());
@@ -323,7 +323,8 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
return wxCoupon; return wxCoupon;
} }
private PayAdapterResult createPayOrder(WxAppinfo appInfo, WxCUserBasicInfo user,WxPayOrder record,WxComposeOrder composeOrder,String productName, EnumPayWay payWay,PayExtraParam params) {
private PayAdapterResult createPayOrder(WxAppinfo appInfo, WxCUserBasicInfo user,WxPayOrder record,WxComposeOrder composeOrder,
String productName, EnumPayWay payWay,PayExtraParam params,boolean isCreatePay) {
IdWorker idworker = IdWorker.get(); IdWorker idworker = IdWorker.get();
EnumPayShare isShare = EnumPayShare.NO; EnumPayShare isShare = EnumPayShare.NO;
@@ -424,6 +425,14 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
} }
} }
} }
if(!isCreatePay){
PayAdapterResult par = new PayAdapterResult();
par.setSuccess(true);
Map<String,String> map = new HashMap<>();
map.put("outOrderNo",record.getOrderId().toString());
par.setData(map);
return par;
}
logger.debug("wxPayRecord md5 before:"+record.toString()); logger.debug("wxPayRecord md5 before:"+record.toString());
String beforemd5 = HashUtil.md5(record.toString()); String beforemd5 = HashUtil.md5(record.toString());


Загрузка…
Отмена
Сохранить