diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index 6a52129a5..90da7f853 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -146,8 +146,8 @@ public class UserThirdCircleOrderController extends BaseController { } catch (NumberFormatException e) {} wxBusinessCircleOrder.setCUserId(userId); // wxBusinessCircleOrder.setCUserPhone(userPhone); -// wxBusinessCircleOrder.setAppid(result.getAppid()); -// wxBusinessCircleOrder.setOpenid(result.getOpenid()); + wxBusinessCircleOrder.setAppid("第三方数据"); + wxBusinessCircleOrder.setOpenid("第三方数据"); wxBusinessCircleOrder.setTimeEnd(timeEndDate); wxBusinessCircleOrder.setAmount(Integer.parseInt(amount)); wxBusinessCircleOrder.setPayAmount(Integer.parseInt(amount)); @@ -274,8 +274,8 @@ public class UserThirdCircleOrderController extends BaseController { // wxBusinessCircleOrder.setWxMerchantName(result.getMerchantName()); // wxBusinessCircleOrder.setWxShopName(result.getShopName()); // wxBusinessCircleOrder.setWxShopNumber(result.getShopNumber()); -// wxBusinessCircleOrder.setAppid(result.getAppid()); -// wxBusinessCircleOrder.setOpenid(result.getOpenid()); + wxBusinessCircleOrder.setAppid("第三方数据"); + wxBusinessCircleOrder.setOpenid("第三方数据"); wxBusinessCircleOrder.setTimeEnd(refundTimeDate); // wxBusinessCircleOrder.setAmount(result.getPayAmount()); // wxBusinessCircleOrder.setPayAmount(result.getPayAmount()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 222f76943..b1be90609 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -271,6 +271,13 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe record.setCreateTime(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.setCUserNickName(order.getCUserNickName()); record.setCUserPhone(order.getCUserPhone());