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

fix order bug

release_toaliyun_real
xiaohanzi 4 лет назад
Родитель
Сommit
c05490b519
3 измененных файлов: 14 добавлений и 6 удалений
  1. +3
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java
  2. +2
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java
  3. +9
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 3
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java Просмотреть файл

@@ -25,6 +25,8 @@ import com.iformall.service.WxCUserService;
import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxCouponService; import com.iformall.service.WxCouponService;
import com.iformall.service.WxOrderService; import com.iformall.service.WxOrderService;
import com.iformall.service.order.OrderFactory;

import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -62,7 +64,7 @@ public class WxOrderController extends BaseController {
@Autowired @Autowired
private WxCUserBasicInfoService wxCUserBasicInfoService; private WxCUserBasicInfoService wxCUserBasicInfoService;
@ApiOperation("分页列表接口") @ApiOperation("分页列表接口")
@GetMapping("list") @GetMapping("list")
@ApiImplicitParams({ @ApiImplicitParams({


+ 2
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java Просмотреть файл

@@ -7,6 +7,7 @@ import com.iformall.domain.po.*;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.service.order.OrderFactory;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@@ -36,7 +37,7 @@ public class WxCouponPasswordController extends BaseController {
@Autowired @Autowired
private WxCUserBasicInfoService userService; private WxCUserBasicInfoService userService;
@ApiOperation(value = "根据卡密领卡", notes = "{\"password\":\"String\",\"formId\":\"String\"}") @ApiOperation(value = "根据卡密领卡", notes = "{\"password\":\"String\",\"formId\":\"String\"}")
@PostMapping("getCouponOrderByPassword") @PostMapping("getCouponOrderByPassword")
public ResultData getCouponOrderByPassword(@RequestBody Map<String, String> params) { public ResultData getCouponOrderByPassword(@RequestBody Map<String, String> params) {


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

@@ -2089,11 +2089,16 @@ public class WxOrderServiceImpl implements WxOrderService {
record.setPayment(0); record.setPayment(0);
record.setFormId(formId); record.setFormId(formId);
record.setOrderGroupId(0L); record.setOrderGroupId(0L);
record.setComposeOrderId(composeOrder.getMainOrderId());
if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) {
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode());
if (null != composeOrder) {
record.setComposeOrderId(composeOrder.getMainOrderId());
if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) {
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode());
}else {
record.setComposeOrderType(composeOrder.getComposeOrderType());
}
}else { }else {
record.setComposeOrderType(composeOrder.getComposeOrderType());
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode());
record.setComposeOrderId(0L);
} }
record.setCouponNumber(couponNumber); record.setCouponNumber(couponNumber);
try { try {


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