Browse Source

fix order

release_toaliyun_real
xiaohanzi 4 years ago
parent
commit
86b7f6b155
2 changed files with 4 additions and 3 deletions
  1. +2
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 2
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java View File

@@ -322,7 +322,8 @@ public class WxCouponOrderController extends BaseController {

return new ResultData(couponOrder);
}

@ApiOperation(value = "根据couponOrderId查询接口", notes = "{\"couponOrderId\":\"string\"}")
@PostMapping("/findById")
public ResultData findById(@RequestBody Map<String, String> paramMap) {


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -572,14 +572,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
if (EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) {
try {
// 核销分账
shareAfterVerify(couponOrder, bUser.getMerchantId(),couponOrder.getPayVendor(),true);
shareAfterVerify(couponOrder, bUser.getMerchantId(),couponOrder.getPayVendor(),false);
} catch (Exception e) {
logger.error("核销记账失败"+e.getMessage(),e);
}
}else {
try {
// 核销分账
shareAfterVerify(couponOrder, bUser.getMerchantId(),couponOrder.getPayVendor(),false);
shareAfterVerify(couponOrder, bUser.getMerchantId(),couponOrder.getPayVendor(),true);
} catch (Exception e) {
logger.error("核销记账失败"+e.getMessage(),e);
}


Loading…
Cancel
Save