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

[POS][修改]:检查券list

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
a049677ca6
2 измененных файлов: 23 добавлений и 3 удалений
  1. +5
    -3
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  2. +18
    -0
      mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java

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

@@ -176,6 +176,9 @@ public class PosServiceImpl implements PosService {
} else { } else {
dataMap.put(WxPayConstant.ORDER_CREATE_SN, orderCreateSN); dataMap.put(WxPayConstant.ORDER_CREATE_SN, orderCreateSN);
} }
if (StringUtils.isBlank(coListStr)) {
errParam(WxPayConstant.COUPON_ORDER_LIST);
}


Integer iSceneType; Integer iSceneType;
try { try {
@@ -219,9 +222,7 @@ public class PosServiceImpl implements PosService {
} }
JSONObject promotionCoupon = new JSONObject(); JSONObject promotionCoupon = new JSONObject();
JSONArray couponList = new JSONArray(); JSONArray couponList = new JSONArray();
if (StringUtils.isBlank(coListStr)) {
errParam(WxPayConstant.COUPON_ORDER_LIST);
}

JSONArray couponOrderArr = JSON.parseArray(coListStr); JSONArray couponOrderArr = JSON.parseArray(coListStr);
if (couponOrderArr.size() != 1) { if (couponOrderArr.size() != 1) {
String errMessage = "核销只能使用一张券"; String errMessage = "核销只能使用一张券";
@@ -316,6 +317,7 @@ public class PosServiceImpl implements PosService {
coQ.put("cUserId", user.getId()); coQ.put("cUserId", user.getId());
coQ.put("merchantId", merchantId); coQ.put("merchantId", merchantId);
List<WxCouponOrderCVo> avaCoList = couponOrderMapper.findAvailCouponOrder(coQ); List<WxCouponOrderCVo> avaCoList = couponOrderMapper.findAvailCouponOrder(coQ);

JSONArray selCoArr = JSONObject.parseArray(coListStr); JSONArray selCoArr = JSONObject.parseArray(coListStr);
if (config.getCoupon().equals(EnumPosCouponEnableType.SingleEnable.getCode())) { if (config.getCoupon().equals(EnumPosCouponEnableType.SingleEnable.getCode())) {
if (selCoArr.size() > 1) { // 为空时,返回所有可用券列表 if (selCoArr.size() > 1) { // 为空时,返回所有可用券列表


+ 18
- 0
mallinkPosApi/src/test/java/com/iformall/pos/test/PosAppTest.java Просмотреть файл

@@ -119,6 +119,24 @@ public class PosAppTest {
Assert.assertEquals(resSigned, true); Assert.assertEquals(resSigned, true);
} }


@Test
public void payCalculate1Test() throws Exception {
String sceneType = String.valueOf(EnumPosSceneType.PAY.getCode());
Map<String, String> reqObj = new HashMap<>();
reqObj.put(WxPayConstant.NONCE_STR, "123456");
reqObj.put(WxPayConstant.DEV_ID, devId);
reqObj.put(WxPayConstant.TENANT_ID, tenantId);
reqObj.put(WxPayConstant.MERCHANT_ID, merchantId);
reqObj.put(WxPayConstant.BUSER_ID, buUserId);
reqObj.put(WxPayConstant.SCENE_TYPE, sceneType);
reqObj.put(WxPayConstant.ORDER_CREATE_SN, posSN);
reqObj.put(WxPayConstant.MEM_PHONE, "18240016029");
reqObj.put(WxPayConstant.ORDER_AMOUNT, "100");
reqObj.put(WxPayConstant.ORDER_AMOUNT_LEFT, "100");
boolean resSigned = sendAndRes("/queryAndCalc", reqObj);
Assert.assertEquals(resSigned, true);
}

@Test @Test
public void verifyCalculateTest() throws Exception { public void verifyCalculateTest() throws Exception {
String selCoList = "[\"321872988134408192\"]"; String selCoList = "[\"321872988134408192\"]";


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