Browse Source

circle

release_toaliyun_real
xhxu 5 years ago
parent
commit
8dce22d14f
2 changed files with 11 additions and 4 deletions
  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 View File

@@ -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());


+ 7
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java View File

@@ -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());


Loading…
Cancel
Save