Explorar el Código

//tuikuan

release_toaliyun_real
xhxu hace 3 años
padre
commit
e6428dea08
Se han modificado 2 ficheros con 20 adiciones y 3 borrados
  1. +7
    -0
      mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql
  2. +13
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java

+ 7
- 0
mallinkAdmin/src/main/resources/db/migration/V2023060500001_douyin_permission.sql Ver fichero

@@ -3,3 +3,10 @@ INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`,
INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (60202, '抖音代金券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinVoucherCoupon', NULL, 0, 60202);

INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (716, '预约订单', 610, 'Y', NULL, 1, NULL, NULL, 'reservationList', NULL, 0, 716);



INSERT INTO `mallink`.`mall_sale_type`(`id`, `name`, `type`, `period`, `menus`) VALUES (13, '抖音尊享+到家', 13, 12, '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 210, 211, 212, 221, 222, 223, 224, 251, 261, 409, 410, 411, 416, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 612, 615, 622, 647, 676, 680, 711, 716, 901, 902, 904, 907, 5502, 60201, 61202, 61501, 61502]');

UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 210, 211, 212, 221, 222, 223, 224, 251, 261, 409, 410, 411, 416, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 612, 615, 622, 647, 650, 676, 680, 711, 901, 902, 904, 907, 5502, 41001, 60202, 61202, 61501, 61502, 71101]' WHERE `id` = 102;


+ 13
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Ver fichero

@@ -62,6 +62,9 @@ public class WxCouponOrderController extends BaseController {
@Autowired
private WxPayOrderService wxPayOrderService;

@Autowired
private WxRefundOrderService wxRefundOrderService;

@Autowired
private WxCardInfoService wxCardInfoService;

@@ -283,9 +286,16 @@ public class WxCouponOrderController extends BaseController {
}

Map res = new HashMap();

res.put("CouponOrderStatus", wxCouponOrderService.getById(Long.valueOf(couponOrderId),getTenantInfo().getTenantId()).getCouponOrderStatus());

WxCouponOrder couponOrder = wxCouponOrderService.getById(Long.valueOf(couponOrderId), getTenantInfo().getTenantId());
res.put("CouponOrderStatus", couponOrder.getCouponOrderStatus());
res.put("outOrderId",couponOrder.getComposeOrderId());
if(EnumCouponOrderStatus.COUPON_ORDER_INVALID.getCode().equals(couponOrder.getCouponOrderStatus())){
WxRefundOrder refundOrder = wxRefundOrderService.findRefundOrder(getTenantInfo(), couponOrder.getOrderId());
if(refundOrder != null){
res.put("outRefundOrderId",refundOrder.getId());
res.put("refundOrderStatus",refundOrder.getRefundOrderStatus());
}
}
return new ResultData(res);
}



Cargando…
Cancelar
Guardar