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

+ 6
- 6
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("第三方数据");
wxBusinessCircleOrder.setOpenid("第三方数据");
wxBusinessCircleOrder.setAppid("来自第三方数据");
wxBusinessCircleOrder.setOpenid("来自第三方数据");
wxBusinessCircleOrder.setTimeEnd(timeEndDate);
wxBusinessCircleOrder.setAmount(Integer.parseInt(amount));
wxBusinessCircleOrder.setPayAmount(Integer.parseInt(amount));
@@ -166,7 +166,7 @@ public class UserThirdCircleOrderController extends BaseController {
aliBusinessCircleOrder.setPayAmount(Integer.parseInt(amount));
aliBusinessCircleOrder.setTimeEnd(timeEndDate);
// aliBusinessCircleOrder.setMallStoreId(mallStoreId);
// aliBusinessCircleOrder.setBuyerId(buyerId);
aliBusinessCircleOrder.setBuyerId("来自第三方数据");
Long userId = null;
try {
userId = Long.parseLong(userNumber);
@@ -274,8 +274,8 @@ public class UserThirdCircleOrderController extends BaseController {
// wxBusinessCircleOrder.setWxMerchantName(result.getMerchantName());
// wxBusinessCircleOrder.setWxShopName(result.getShopName());
// wxBusinessCircleOrder.setWxShopNumber(result.getShopNumber());
wxBusinessCircleOrder.setAppid("第三方数据");
wxBusinessCircleOrder.setOpenid("第三方数据");
wxBusinessCircleOrder.setAppid("来自第三方数据");
wxBusinessCircleOrder.setOpenid("来自第三方数据");
wxBusinessCircleOrder.setTimeEnd(refundTimeDate);
// wxBusinessCircleOrder.setAmount(result.getPayAmount());
// wxBusinessCircleOrder.setPayAmount(result.getPayAmount());
@@ -300,7 +300,7 @@ public class UserThirdCircleOrderController extends BaseController {
}
aliBusinessCircleOrder.setTimeEnd(refundTimeDate);
// aliBusinessCircleOrder.setMallStoreId(mallStoreId);
// aliBusinessCircleOrder.setBuyerId(buyerId);
aliBusinessCircleOrder.setBuyerId("来自第三方数据");

// aliBusinessCircleOrder.setMallId(mallId);
// aliBusinessCircleOrder.setMallName(mallName);


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

@@ -271,6 +271,10 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder

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

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


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

@@ -180,7 +180,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe
creditHistory.setMerchantId(record.getMerchantId());
creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode());
creditHistory.setSpend(record.getPayAmount());
creditHistory.setChangePurpose("微信商圈消费:商户["+record.getWxMerchantName()+"] ("+record.getPayAmountStr()+"元) ");
creditHistory.setChangePurpose("微信商圈消费:商户["+record.getMerchantName()+"] ("+record.getPayAmountStr()+"元) ");
creditHistory = creditHistoryService.saveOrUpdate(creditHistory,record.getTenantId());

if (creditHistory.getCreditNum() != null) {


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