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

//update

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
83382cf633
3 измененных файлов: 12 добавлений и 9 удалений
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java
  2. +8
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java

+ 3
- 0
mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordType.java Просмотреть файл

@@ -23,6 +23,9 @@ public enum EnumMsgRecordType {
INSIDE_ORDER_REFUND(107, "退款提交成功"),
INSIDE_ORDER_PUSH(108, "订单同步"),
INSIDE_PRODUCT_PUSH(109, "商品状态或库存同步"),

MALL_COO_USER_PUSH(110, "猫酷同步会员"),
ORDER_SNAPSHOT_PUSH(111, "订单快照"),
;

public static EnumMsgRecordType getEnum(Integer code) {


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

@@ -969,13 +969,13 @@ public class WxCouponServiceImpl implements WxCouponService {
}

private void spuStockSync(TenantEntity tenantEntity,Long id){
new Thread(() -> {
//1秒之后同步poi
try {
Thread.currentThread().sleep(1000);
} catch (Exception e) {
logger.error("sleep error: " + e.getMessage());
}
// new Thread(() -> {
// //1秒之后同步poi
// try {
// Thread.currentThread().sleep(1000);
// } catch (Exception e) {
// logger.error("sleep error: " + e.getMessage());
// }

List<Long> couponChannelIds = wxCouponChannelMapper.getPoiProductIdList(tenantEntity.getTenantId(),id);
if(couponChannelIds != null && couponChannelIds.size() > 0){
@@ -991,7 +991,7 @@ public class WxCouponServiceImpl implements WxCouponService {
}
}

}).start();
// }).start();

}



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

@@ -104,7 +104,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen
WxOrderCouponVo wxOrderCouponVo = batchOrder.getOrders().get(0);

Map<String,Object> orderDetail = new HashMap<>();
orderDetail.put("order_id",batchOrder.getId().toString());
orderDetail.put("order_id",payOrder.getPayOrderNo());
orderDetail.put("create_time",batchOrder.getCreateDate().getTime());
orderDetail.put("status", getTtOrderStatus(wxOrderCouponVo.getOrderStatus(),wxOrderCouponVo.getCouponOrderStatus()).getMessage());
orderDetail.put("total_price",batchOrder.getPayment());


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