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

Merge branch 'release_toaliyun_real_push_order' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_push_order

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
55046b097b
4 измененных файлов: 2 добавлений и 60 удалений
  1. Двоичные данные
      mallinkAdmin/src/main/resources/doc/抖音小程序/富茂抖音小城操作流程SOP.docx
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java
  3. +0
    -48
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
  4. +1
    -11
      mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderRefundMsgServiceImpl.java

Двоичные данные
mallinkAdmin/src/main/resources/doc/抖音小程序/富茂抖音小城操作流程SOP.docx Просмотреть файл


+ 1
- 1
mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java Просмотреть файл

@@ -86,7 +86,7 @@ public class AliyunOSS {
if(null != result){
log.info("==========>OSS文件上传成功,OSS地址:"+fileUrl);
//JPG的加上压缩
if (suffix.equals("JPG") || suffix.equals("jpg")) {
if (suffix.equals(".JPG") || suffix.equals(".jpg")) {
return aliyunOSSConfig.getFiledomain() + "/" + fileUrl+"?x-oss-process=image/resize,w_10000/quality,q_60";
}else {
return aliyunOSSConfig.getFiledomain() + "/" + fileUrl;


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

@@ -261,54 +261,6 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}


// final IdWorker idWorker = IdWorker.get();
// Long refundOrderId = idWorker.nextId();
//
// Date currentDate = new Date();
//
// WxBatchOrder order =new WxBatchOrder();
// order.setId(idWorker.nextId());
// order.setCUserId(wxOrder.getCUserId());
// order.updateTenantInfo(wxCouponOrder);
// order.setPayment(wxOrder.getPayment());
// order.setPayVendor(wxOrder.getPayVendor());
// order.setOrderType(wxOrder.getComposeOrderType());
// order.setCreateDate(new Date());
// wxBatchOrderMapper.insert(order);
// // 创建 refund Order
// WxOrder rOrder = new WxOrder();
// rOrder.setId(refundOrderId);
// rOrder.updateTenantInfo(wxCouponOrder);
// rOrder.setOrderNumber(wxOrder.getOrderNumber()); // 退款订单填写支付订单orderNumber
// rOrder.setProductId(wxOrder.getProductId());
// rOrder.setType(EnumOrderType.COUPON.getCode());
// rOrder.setPayVendor(wxOrder.getPayVendor());
// rOrder.setCUserId(wxOrder.getCUserId());
// if (payType == EnumPayType.PAY_B_REFUND) {
// rOrder.setDetail("["+bUser.getId()+"]B端管理员操作退款"); //B端发起退款后存B端用户ID在此
// }else if (payType == EnumPayType.PAY_ADMIN_REFUND) {
// rOrder.setDetail("["+aUserId+"]A端管理员操作退款");
// } else if (payType == EnumPayType.PAY_AUTO_REFUND) {
// rOrder.setDetail("auto端发起退款");
// } else {
// rOrder.setDetail("自己发起退款");
// }
// rOrder.setPaymentType(payType.getCode());
// rOrder.setPayment(wxOrder.getPayment());
// rOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode());
// rOrder.setCreateDate(currentDate);
// rOrder.setUpdateDate(currentDate);
// rOrder.setComposeOrderId(order.getId());
// rOrder.setComposeOrderType(wxOrder.getComposeOrderType());
// rOrder.setCouponNumber(wxOrder.getCouponNumber());
// try {
// wxOrderMapper.insert(rOrder);
// } catch (Exception e) {
// logger.error("退款订单保存出错: " + e.getMessage(),e);
// throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "退款订单保存出错");
// }

for (WxCouponOrder wxCouponOrder:couponOrderList) {
// 更改 couponOrder 状态
if (wxCouponOrder.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) {


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

@@ -31,20 +31,10 @@ public class FmInsideOrderRefundMsgServiceImpl implements MsgSendService {
@Autowired
private WxCUserBasicInfoService userService;

@Autowired
private WxCouponService couponService;

@Autowired
private WxCouponOrderService couponOrderService;

@Autowired
private WxCouponChannelService couponChannelService;


@Override
public void send(BaseMsg baseMsg) throws Exception{
FmInsideOrderRefundMsg msg = (FmInsideOrderRefundMsg)baseMsg;
WxOrder order = orderService.getById(msg.getOrderId(),msg.getTenantId());
if(order == null) {
logger.error("订单未找到: " + msg.getOrderId());


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