Browse Source

[POS][修改]:支付订单类型修改

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
9e3906a692
4 changed files with 28 additions and 37 deletions
  1. +5
    -10
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  2. +15
    -17
      mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java
  3. +4
    -5
      mallinkService/src/main/java/com/iformall/enums/EnumNeuPosPamentType.java
  4. +4
    -5
      mallinkService/src/main/java/com/iformall/enums/EnumNeuPosRefundType.java

+ 5
- 10
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java View File

@@ -1866,10 +1866,7 @@ public class PosServiceImpl implements PosService {
logger.error(e.getMessage()); logger.error(e.getMessage());
throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), e.getMessage()); throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), e.getMessage());
} }
if (neuPayOrderType.equals(EnumNeuPosPamentType.MEM_DISCOUNT.getCode())) {
// 会员折扣
WxPayOrder payOrder = payOrderFromMemDiscount(merchantBUser, order, memId, neuPayOrderId, neuPaymentAmount, neuPosPayOrderTime);
} else if (neuPayOrderType.equals(EnumNeuPosPamentType.MEM_COUPON.getCode())) {
if (neuPayOrderType.equals(EnumNeuPosPamentType.MEM_COUPON.getCode())) {
// 优惠券 // 优惠券
WxPayOrder payOrder = payOrderFromCouponVerify( WxPayOrder payOrder = payOrderFromCouponVerify(
scoreCreditCalc, scoreCreditCalc,
@@ -1884,6 +1881,7 @@ public class PosServiceImpl implements PosService {
merchant, merchantBUser, order, memId, merchant, merchantBUser, order, memId,
neuPayOrderId, neuPaymentAmount, neuPosPayOrderTime, neuPayThirdNo); neuPayOrderId, neuPaymentAmount, neuPosPayOrderTime, neuPayThirdNo);
} else { } else {
// 其它
payOrderFromPos(scoreCreditCalc, payOrderFromPos(scoreCreditCalc,
merchant, merchantBUser, order, memId, merchant, merchantBUser, order, memId,
neuPayOrderType, neuPayOrderId, neuPaymentAmount, neuPosPayOrderTime, neuPayThirdNo); neuPayOrderType, neuPayOrderId, neuPaymentAmount, neuPosPayOrderTime, neuPayThirdNo);
@@ -1900,14 +1898,10 @@ public class PosServiceImpl implements PosService {
// TODO // TODO
// ADD to wx_pay_order // ADD to wx_pay_order
String neuRefundOrderType = refundOrderObj.getString(WxPayConstant.NEU_REFUND_ORDER_TYPE); String neuRefundOrderType = refundOrderObj.getString(WxPayConstant.NEU_REFUND_ORDER_TYPE);
if (neuRefundOrderType.equalsIgnoreCase(String.valueOf(EnumNeuPosRefundType.MEM_DISCOUNT.getCode()))) {
// 会员折扣,
} else if (neuRefundOrderType.equalsIgnoreCase(String.valueOf(EnumNeuPosRefundType.MEM_COUPON.getCode()))) {
if (neuRefundOrderType.equalsIgnoreCase(String.valueOf(EnumNeuPosRefundType.MEM_COUPON.getCode()))) {
// 优惠券, 退优惠券 // 优惠券, 退优惠券
} else if (neuRefundOrderType.equalsIgnoreCase(String.valueOf(EnumNeuPosRefundType.MEM_CARD.getCode()))) { } else if (neuRefundOrderType.equalsIgnoreCase(String.valueOf(EnumNeuPosRefundType.MEM_CARD.getCode()))) {
// 预付卡, 不能退 // 预付卡, 不能退
} else if (neuRefundOrderType.equalsIgnoreCase(String.valueOf(EnumNeuPosRefundType.BOOK.getCode()))) {
// 记账
} else { } else {


} }
@@ -1949,7 +1943,8 @@ public class PosServiceImpl implements PosService {
setShare(EnumPayShare.NO.getCode()); setShare(EnumPayShare.NO.getCode());
setPosPayOrderId(posPayOrderId); setPosPayOrderId(posPayOrderId);
setPosPayOrderTime(neuPosPayOrderTime.getTime()); setPosPayOrderTime(neuPosPayOrderTime.getTime());
setPosPaymentType(EnumNeuPosPamentType.MEM_DISCOUNT.getCode());
/// TODO
/// setPosPaymentType(EnumNeuPosPamentType.MEM_DISCOUNT.getCode());
setPosPayDes("POS会员折扣支付"); setPosPayDes("POS会员折扣支付");
}}; }};
int sqlRow = payOrderMapper.insertSelective(payOrder); int sqlRow = payOrderMapper.insertSelective(payOrder);


+ 15
- 17
mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java View File

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.iformall.PosApplication; import com.iformall.PosApplication;
import com.iformall.enums.EnumNeuPosPamentType;
import com.iformall.enums.EnumPosSceneType; import com.iformall.enums.EnumPosSceneType;
import com.iformall.pay.WxPayConstant; import com.iformall.pay.WxPayConstant;
import com.iformall.pay.WxPayment; import com.iformall.pay.WxPayment;
@@ -137,8 +138,9 @@ public class PosAppTest {


@Test @Test
public void payCalculateTest_NoCouponOrder() throws Exception { public void payCalculateTest_NoCouponOrder() throws Exception {
String memId = "321178010928119808";
String phone = "13910154397";
//String memId = "321178010928119808";
//String phone = "13910154397";
String cardId = "321883878446825472";
String orderAmount = "2000"; String orderAmount = "2000";
String orderAmountLeft = "2000"; String orderAmountLeft = "2000";
String selCoList = "[]"; String selCoList = "[]";
@@ -149,8 +151,9 @@ public class PosAppTest {
reqObj.put(WxPayConstant.TENANT_ID, tenantId); reqObj.put(WxPayConstant.TENANT_ID, tenantId);
reqObj.put(WxPayConstant.MERCHANT_ID, merchantId); reqObj.put(WxPayConstant.MERCHANT_ID, merchantId);
reqObj.put(WxPayConstant.BUSER_ID, buUserId); reqObj.put(WxPayConstant.BUSER_ID, buUserId);
reqObj.put(WxPayConstant.MEM_ID, memId);
reqObj.put(WxPayConstant.MEM_PHONE, phone);
//reqObj.put(WxPayConstant.MEM_ID, memId);
//reqObj.put(WxPayConstant.MEM_PHONE, phone);
reqObj.put(WxPayConstant.CARD_ID, cardId);
reqObj.put(WxPayConstant.SCENE_TYPE, sceneType); reqObj.put(WxPayConstant.SCENE_TYPE, sceneType);
reqObj.put(WxPayConstant.ORDER_AMOUNT, orderAmount); reqObj.put(WxPayConstant.ORDER_AMOUNT, orderAmount);
reqObj.put(WxPayConstant.ORDER_AMOUNT_LEFT, orderAmountLeft); reqObj.put(WxPayConstant.ORDER_AMOUNT_LEFT, orderAmountLeft);
@@ -316,8 +319,8 @@ public class PosAppTest {
String posOrderId = "2"; String posOrderId = "2";
String orderAmount = "1000"; String orderAmount = "1000";
String posPayOrderId = "2"; String posPayOrderId = "2";
String posPaymentType = "4";
String posPaymentTypeDes = "优惠券";
String posPaymentType = String.valueOf(EnumNeuPosPamentType.MEM_COUPON.getCode());
String posPaymentTypeDes = EnumNeuPosPamentType.MEM_COUPON.getMessage();
String posPaymentStatus = "0"; String posPaymentStatus = "0";


String couponOrderId = "321878223800205312"; String couponOrderId = "321878223800205312";
@@ -414,17 +417,14 @@ public class PosAppTest {


@Test @Test
public void cardPaySyncTest() throws Exception { public void cardPaySyncTest() throws Exception {
String memId = "321178010928119808";
String memPhone = "13910154397";
String sceneType = "1"; // 支付 String sceneType = "1"; // 支付
String posOrderId = "2";
String orderAmount = "1000";
String posOrderId = "1";
String orderAmount = "2000";
String posPayOrderId = "2"; String posPayOrderId = "2";
String posPaymentType = "4";
String posPaymentTypeDes = "优惠券";
String posPaymentType = String.valueOf(EnumNeuPosPamentType.MEM_CARD.getCode());
String posPaymentTypeDes = EnumNeuPosPamentType.MEM_CARD.getMessage();
String posPaymentStatus = "0"; String posPaymentStatus = "0";

String couponOrderId = "321878223800205312";
String cardSpendId = "328803369448411136";


Date curDate = new Date(); Date curDate = new Date();


@@ -435,7 +435,7 @@ public class PosAppTest {
payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_TYPE_DES, posPaymentTypeDes); payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_TYPE_DES, posPaymentTypeDes);
payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_PARAM, "{}"); payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_PARAM, "{}");
payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_STATUS, posPaymentStatus); payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_STATUS, posPaymentStatus);
payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_OUT_NO, couponOrderId);
payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_OUT_NO, cardSpendId);
payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_AMOUNT, orderAmount); payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_AMOUNT, orderAmount);
payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_OUT_TIME, neuDateFormat.format(curDate)); payDetailOne.put(WxPayConstant.NEU_PAY_ORDER_OUT_TIME, neuDateFormat.format(curDate));


@@ -448,8 +448,6 @@ public class PosAppTest {
reqObj.put(WxPayConstant.NEU_TENANT_ID, tenantId); reqObj.put(WxPayConstant.NEU_TENANT_ID, tenantId);
reqObj.put(WxPayConstant.NEU_MERCHANT_ID, merchantId); reqObj.put(WxPayConstant.NEU_MERCHANT_ID, merchantId);
reqObj.put(WxPayConstant.NEU_BU_USER_ID, buUserId); reqObj.put(WxPayConstant.NEU_BU_USER_ID, buUserId);
reqObj.put(WxPayConstant.NEU_MEM_ID, memId);
reqObj.put(WxPayConstant.NEU_MEM_PHONE, memPhone);
reqObj.put(WxPayConstant.NEU_ORDER_SCENE_TYPE, sceneType); reqObj.put(WxPayConstant.NEU_ORDER_SCENE_TYPE, sceneType);
reqObj.put(WxPayConstant.NEU_ORDER_ID, posOrderId); reqObj.put(WxPayConstant.NEU_ORDER_ID, posOrderId);
reqObj.put(WxPayConstant.NEU_ORDER_TIME, neuDateFormat.format(curDate)); reqObj.put(WxPayConstant.NEU_ORDER_TIME, neuDateFormat.format(curDate));


+ 4
- 5
mallinkService/src/main/java/com/iformall/enums/EnumNeuPosPamentType.java View File

@@ -5,14 +5,13 @@ package com.iformall.enums;
*/ */
public enum EnumNeuPosPamentType { public enum EnumNeuPosPamentType {


// 来源于Neusoft的定义 0微信;1支付宝;2现金;3会员折扣;4优惠券;5预付卡;6银行卡
// 来源于Neusoft的定义 0微信;1支付宝;2现金;3优惠券;4预付卡;5银行卡
WECHAT(0, "微信"), WECHAT(0, "微信"),
ALIPAY(1, "支付宝"), ALIPAY(1, "支付宝"),
CASH(2, "现金"), CASH(2, "现金"),
MEM_DISCOUNT(3, "会员折扣"),
MEM_COUPON(4, "优惠券"),
MEM_CARD(5, "预付卡"),
MEM_BANKCARD(6, "银行卡"),
MEM_COUPON(3, "优惠券"),
MEM_CARD(4, "预付卡"),
MEM_BANKCARD(5, "银行卡"),
; ;
public static EnumNeuPosPamentType getEnum(Integer code) { public static EnumNeuPosPamentType getEnum(Integer code) {
for (EnumNeuPosPamentType value : values()) { for (EnumNeuPosPamentType value : values()) {


+ 4
- 5
mallinkService/src/main/java/com/iformall/enums/EnumNeuPosRefundType.java View File

@@ -9,11 +9,10 @@ public enum EnumNeuPosRefundType {
WECHAT(0, "微信"), WECHAT(0, "微信"),
ALIPAY(1, "支付宝"), ALIPAY(1, "支付宝"),
CASH(2, "现金"), CASH(2, "现金"),
MEM_DISCOUNT(3, "会员折扣"),
MEM_COUPON(4, "优惠券"),
MEM_CARD(5, "预付卡"),
MEM_BANKCARD(6, "银行卡"),
BOOK(7, "记账"),
MEM_COUPON(3, "优惠券"),
MEM_CARD(4, "预付卡"),
MEM_BANKCARD(5, "银行卡"),
BOOK(6, "记账"),
; ;
public static EnumNeuPosRefundType getEnum(Integer code) { public static EnumNeuPosRefundType getEnum(Integer code) {
for (EnumNeuPosRefundType value : values()) { for (EnumNeuPosRefundType value : values()) {


Loading…
Cancel
Save