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

//update push

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
77ab396aa7
3 измененных файлов: 8 добавлений и 7 удалений
  1. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  2. +4
    -5
      mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushMsgServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java

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

@@ -1325,8 +1325,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
@Override @Override
public WxPayOrder getByObj(WxPayOrder payOrderQ) { public WxPayOrder getByObj(WxPayOrder payOrderQ) {
List<WxPayOrder> list = wxPayOrderMapper.findList(payOrderQ); List<WxPayOrder> list = wxPayOrderMapper.findList(payOrderQ);
if (list.size() > 0) {
if (list != null && list.size() == 1) {
return list.get(0); return list.get(0);
}else if(list != null && list.size() > 1){
throw new MallinkException(ErrorCode.PAY_ORDER_ERROR);
} }
return null; return null;
} }


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

@@ -4,15 +4,10 @@ import com.iformall.common.ErrorCode;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.BaseMsg;
import com.iformall.domain.po.msg.FmInsideOrderPushMsg; import com.iformall.domain.po.msg.FmInsideOrderPushMsg;
import com.iformall.domain.po.msg.FmInsideOrderRefundMsg;
import com.iformall.domain.vo.WxOrderCouponVo;
import com.iformall.enums.EnumComposeOrder; import com.iformall.enums.EnumComposeOrder;
import com.iformall.enums.EnumPayType;
import com.iformall.enums.EnumPayWay; import com.iformall.enums.EnumPayWay;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.mapper.TtCUserMapper; import com.iformall.mapper.TtCUserMapper;
import com.iformall.mapper.WxBatchOrderMapper;
import com.iformall.mapper.WxCUserMapper;
import com.iformall.mapper.WxPayOrderMapper; import com.iformall.mapper.WxPayOrderMapper;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.service.msg.MsgSendService; import com.iformall.service.msg.MsgSendService;
@@ -49,6 +44,9 @@ public class FmInsideOrderPushMsgServiceImpl implements MsgSendService {
@Autowired @Autowired
TtCUserMapper ttCUserMapper; TtCUserMapper ttCUserMapper;


@Autowired
WxPayOrderMapper wxPayOrderMapper;



@Override @Override
public void send(BaseMsg baseMsg) throws Exception{ public void send(BaseMsg baseMsg) throws Exception{
@@ -67,6 +65,7 @@ public class FmInsideOrderPushMsgServiceImpl implements MsgSendService {
logger.error("主订单未找到: " + msg.getBatchOrderId()); logger.error("主订单未找到: " + msg.getBatchOrderId());
throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND.getCode(), "主订单未找到" + msg.getBatchOrderId()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND.getCode(), "主订单未找到" + msg.getBatchOrderId());
} }

if(EnumPayWay.PAY_WAY_TT.getCode().equals(batchOrder.getPayVendor()) if(EnumPayWay.PAY_WAY_TT.getCode().equals(batchOrder.getPayVendor())
&& EnumComposeOrder.SINGLE.getCode().equals(batchOrder.getOrderType()) && EnumComposeOrder.SINGLE.getCode().equals(batchOrder.getOrderType())
&& batchOrder.getOrders().size() == 1){ && batchOrder.getOrders().size() == 1){


+ 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); WxOrderCouponVo wxOrderCouponVo = batchOrder.getOrders().get(0);


Map<String,Object> orderDetail = new HashMap<>(); 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("create_time",batchOrder.getCreateDate().getTime());
orderDetail.put("status", getTtOrderStatus(wxOrderCouponVo.getOrderStatus(),wxOrderCouponVo.getCouponOrderStatus()).getMessage()); orderDetail.put("status", getTtOrderStatus(wxOrderCouponVo.getOrderStatus(),wxOrderCouponVo.getCouponOrderStatus()).getMessage());
orderDetail.put("total_price",batchOrder.getPayment()); orderDetail.put("total_price",batchOrder.getPayment());


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