xhxu 5 лет назад
Родитель
Сommit
8dce22d14f
2 измененных файлов: 11 добавлений и 4 удалений
  1. +4
    -4
      mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java
  2. +7
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java

+ 4
- 4
mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java Просмотреть файл

@@ -146,8 +146,8 @@ public class UserThirdCircleOrderController extends BaseController {
} catch (NumberFormatException e) {} } catch (NumberFormatException e) {}
wxBusinessCircleOrder.setCUserId(userId); wxBusinessCircleOrder.setCUserId(userId);
// wxBusinessCircleOrder.setCUserPhone(userPhone); // wxBusinessCircleOrder.setCUserPhone(userPhone);
// wxBusinessCircleOrder.setAppid(result.getAppid());
// wxBusinessCircleOrder.setOpenid(result.getOpenid());
wxBusinessCircleOrder.setAppid("第三方数据");
wxBusinessCircleOrder.setOpenid("第三方数据");
wxBusinessCircleOrder.setTimeEnd(timeEndDate); wxBusinessCircleOrder.setTimeEnd(timeEndDate);
wxBusinessCircleOrder.setAmount(Integer.parseInt(amount)); wxBusinessCircleOrder.setAmount(Integer.parseInt(amount));
wxBusinessCircleOrder.setPayAmount(Integer.parseInt(amount)); wxBusinessCircleOrder.setPayAmount(Integer.parseInt(amount));
@@ -274,8 +274,8 @@ public class UserThirdCircleOrderController extends BaseController {
// wxBusinessCircleOrder.setWxMerchantName(result.getMerchantName()); // wxBusinessCircleOrder.setWxMerchantName(result.getMerchantName());
// wxBusinessCircleOrder.setWxShopName(result.getShopName()); // wxBusinessCircleOrder.setWxShopName(result.getShopName());
// wxBusinessCircleOrder.setWxShopNumber(result.getShopNumber()); // wxBusinessCircleOrder.setWxShopNumber(result.getShopNumber());
// wxBusinessCircleOrder.setAppid(result.getAppid());
// wxBusinessCircleOrder.setOpenid(result.getOpenid());
wxBusinessCircleOrder.setAppid("第三方数据");
wxBusinessCircleOrder.setOpenid("第三方数据");
wxBusinessCircleOrder.setTimeEnd(refundTimeDate); wxBusinessCircleOrder.setTimeEnd(refundTimeDate);
// wxBusinessCircleOrder.setAmount(result.getPayAmount()); // wxBusinessCircleOrder.setAmount(result.getPayAmount());
// wxBusinessCircleOrder.setPayAmount(result.getPayAmount()); // wxBusinessCircleOrder.setPayAmount(result.getPayAmount());


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

@@ -271,6 +271,13 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe
record.setCreateTime(now); record.setCreateTime(now);
record.setUpdateTime(now); record.setUpdateTime(now);


if(record.getAmount() == null){
record.setAmount(order.getAmount());
}
if(record.getPayAmount() == null){
record.setPayAmount(order.getPayAmount());
}

record.setCUserId(order.getCUserId()); record.setCUserId(order.getCUserId());
record.setCUserNickName(order.getCUserNickName()); record.setCUserNickName(order.getCUserNickName());
record.setCUserPhone(order.getCUserPhone()); record.setCUserPhone(order.getCUserPhone());


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