Kaynağa Gözat

fix order

release_toaliyun_real
xiaohanzi 4 yıl önce
ebeveyn
işleme
7b4cc5f2b1
4 değiştirilmiş dosya ile 10 ekleme ve 4 silme
  1. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  2. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  3. +5
    -0
      mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java
  4. +2
    -1
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java

+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Dosyayı Görüntüle

@@ -101,7 +101,7 @@ public class WxOrderController extends BaseController {
} }
@ApiOperation(value = "单个券单个订单,卡(分账导致无法批量下单)、拼团,砍价用", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}") @ApiOperation(value = "单个券单个订单,卡(分账导致无法批量下单)、拼团,砍价用", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}")
@PostMapping("singleSave")
@PostMapping("save")
public ResultData saveOrder(@RequestBody OrderSaveDto orderSaveDto) { public ResultData saveOrder(@RequestBody OrderSaveDto orderSaveDto) {
Long memberId; Long memberId;
try { try {


+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java Dosyayı Görüntüle

@@ -144,12 +144,12 @@ public class WxPayOrderController extends BaseController {
} }
} }


@ApiOperation(value = "更新支付订单状态", notes = "{\"payOrderId\":\"string\",\"composeOrderId\":\"string\",\"status\":integer,\"reason\":\"string\"}")
@ApiOperation(value = "更新支付订单状态", notes = "{\"payOrderId\":\"string\",\"orderId\":\"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) {
logger.info("/api/pay/updatePayOrder" + paramMap.toString()); logger.info("/api/pay/updatePayOrder" + paramMap.toString());
String payOrderIdStr = (String) paramMap.get("payOrderId"); String payOrderIdStr = (String) paramMap.get("payOrderId");
String orderIdStr = (String) paramMap.get("composeOrderId");
String orderIdStr = (String) paramMap.get("orderId");
String reasonStr = (String) paramMap.get("reason"); String reasonStr = (String) paramMap.get("reason");
Integer status = (Integer) paramMap.get("status"); Integer status = (Integer) paramMap.get("status");
if (StringUtils.isBlank(orderIdStr)) { if (StringUtils.isBlank(orderIdStr)) {


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java Dosyayı Görüntüle

@@ -11,6 +11,7 @@ import com.iformall.domain.dto.OrderComposeSaveDto;
import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrder;
import com.iformall.domain.po.WxPayOrder;
import com.iformall.enums.EnumComposeOrder; import com.iformall.enums.EnumComposeOrder;
import com.iformall.enums.EnumPayWay; import com.iformall.enums.EnumPayWay;
import com.iformall.mapper.WxOrderMapper; import com.iformall.mapper.WxOrderMapper;
@@ -78,4 +79,8 @@ public class SingleOrderAdapterService implements OrderAdapterService {
return coupon.getSubsidyNum(); return coupon.getSubsidyNum();
} }


@Override
public void doOthersAfterPaySuccess(WxOrder order, WxPayOrder record) {
}

} }

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java Dosyayı Görüntüle

@@ -38,7 +38,7 @@ public class CouponPackageOrderAdapterService extends BaseBatchOrderAdapterServi


@Override @Override
public Integer calcuteChildOrderSubsidy(WxCoupon coupon) { public Integer calcuteChildOrderSubsidy(WxCoupon coupon) {
return coupon.getSubsidyNum();
return 0;
} }


@Override @Override
@@ -49,6 +49,7 @@ public class CouponPackageOrderAdapterService extends BaseBatchOrderAdapterServi
@Override @Override
public void doOthersAfterPaySuccess(WxOrder order, WxPayOrder record) { public void doOthersAfterPaySuccess(WxOrder order, WxPayOrder record) {
//手动核销发券 //手动核销发券
} }
} }

Yükleniyor…
İptal
Kaydet