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

[POS][修改]:订单同步,添加检查

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
7265489d49
3 измененных файлов: 16 добавлений и 1 удалений
  1. +4
    -0
      mallinkPosApi/src/main/java/com/iformall/controller/PosController.java
  2. +9
    -1
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java

+ 4
- 0
mallinkPosApi/src/main/java/com/iformall/controller/PosController.java Просмотреть файл

@@ -298,6 +298,10 @@ public class PosController extends BaseController {
"\"order_amount\":\"string单位(分)(必填)\"," + "\"order_amount\":\"string单位(分)(必填)\"," +
"\"order_amount_left\":\"string单位(分)(选填)\"," + "\"order_amount_left\":\"string单位(分)(选填)\"," +
"\"order_create_sn\":\"string单位(分)(必填)\"," + "\"order_create_sn\":\"string单位(分)(必填)\"," +
"\"payment_detail\":{支付时必填...." +
"}" +
"\"refund_detail\":{退款时必填...." +
"}" +
"\"payment_info\":{" + "\"payment_info\":{" +
"\"card_id\":\"string(必填)\"," + "\"card_id\":\"string(必填)\"," +
"\"card_spend_id\":\"string(必填)\"," + "\"card_spend_id\":\"string(必填)\"," +


+ 9
- 1
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Просмотреть файл

@@ -1784,7 +1784,7 @@ public class PosServiceImpl implements PosService {
String buUserIdStr = params.get(WxPayConstant.BUSER_ID); // POS操作员ID String buUserIdStr = params.get(WxPayConstant.BUSER_ID); // POS操作员ID
String cuUserIdStr = params.get(WxPayConstant.MEM_ID); // 富茂系统会员ID String cuUserIdStr = params.get(WxPayConstant.MEM_ID); // 富茂系统会员ID
String cuPhoneStr = params.get(WxPayConstant.MEM_PHONE); // 富茂系统会员手机号 String cuPhoneStr = params.get(WxPayConstant.MEM_PHONE); // 富茂系统会员手机号
String sceneTypeStr = params.get(WxPayConstant.SCENE_TYPE); // 场景类型
String sceneTypeStr = params.get(WxPayConstant.SCENE_TYPE); // 场景类型
String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID
String posOrderTimeStr = params.get(WxPayConstant.POS_ORDER_TIME); // POS订单时间 String posOrderTimeStr = params.get(WxPayConstant.POS_ORDER_TIME); // POS订单时间
String posAmountStr = params.get(WxPayConstant.ORDER_AMOUNT); // POS订单总额 String posAmountStr = params.get(WxPayConstant.ORDER_AMOUNT); // POS订单总额
@@ -1855,9 +1855,17 @@ public class PosServiceImpl implements PosService {
WxMerchantBUser merchantBUser = checkAndGetMerchantUser(buUserId, merchantId); WxMerchantBUser merchantBUser = checkAndGetMerchantUser(buUserId, merchantId);
// 4. 同步 // 4. 同步
if (posStatusStr.equalsIgnoreCase(WxPayConstant.NEU_ORDER_PAY)) { if (posStatusStr.equalsIgnoreCase(WxPayConstant.NEU_ORDER_PAY)) {
String payDetail = params.get(WxPayConstant.PAY_DETAIL);
if (StringUtils.isBlank(posStatusStr)) {
errParam(WxPayConstant.PAYMENT_DETAIL);
}
// 4.1 支付同步 // 4.1 支付同步
syncOrder(params, merchant, merchantBUser, iSceneType, posOrderId, memId, posAmount, orderTime, orderCreateSN); syncOrder(params, merchant, merchantBUser, iSceneType, posOrderId, memId, posAmount, orderTime, orderCreateSN);
} else if (posStatusStr.equalsIgnoreCase(WxPayConstant.NEU_ORDER_REFUND)) { } else if (posStatusStr.equalsIgnoreCase(WxPayConstant.NEU_ORDER_REFUND)) {
String payDetail = params.get(WxPayConstant.NEU_REFUND_DETAIL);
if (StringUtils.isBlank(posStatusStr)) {
errParam(WxPayConstant.REFUND_DETAIL);
}
// 退款同步 // 退款同步
syncRefundOrder(params, merchantBUser, iSceneType, posOrderId, memId, posAmount, orderTime, orderCreateSN); syncRefundOrder(params, merchantBUser, iSceneType, posOrderId, memId, posAmount, orderTime, orderCreateSN);
} }


+ 3
- 0
mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java Просмотреть файл

@@ -114,6 +114,9 @@ public class WxPayConstant {
public final static String REMAIN_AMOUNT = "remain_amount"; public final static String REMAIN_AMOUNT = "remain_amount";
public final static String ORDER_STATUS = "order_status"; public final static String ORDER_STATUS = "order_status";


public final static String PAYMENT_DETAIL = "payment_detail";
public final static String REFUND_DETAIL = "refund_detail";

public final static String POINT = "point"; public final static String POINT = "point";
public final static String CREDIT = "credit"; public final static String CREDIT = "credit";




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