From 217feeba9b3f417109f5edbe2b4cbb3989befcdd Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 29 Sep 2021 15:01:11 +0800 Subject: [PATCH] update couponOrder --- .../java/com/iformall/service/impl/PosServiceImpl.java | 1 + .../service/impl/WxCouponOrderServiceImpl.java | 10 ++++++++++ .../src/main/resources/mapper/WxCouponOrderMapper.xml | 9 +++++++++ .../src/main/resources/mapper/WxOrderMapper.xml | 2 +- 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 38093ca11..703f442cf 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -2186,6 +2186,7 @@ public class PosServiceImpl implements PosService { updateCO.setId(couponOrderId); updateCO.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); updateCO.setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode()); + couponOrderMapper.updateById(updateCO); } WxCouponOrderCVo couponOrderCVo = couponOrderService.detailCUserVo(posPayOrderNo,merchantBUser); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 3f4eaa437..ecbb9c2b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -462,6 +462,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { couponOrder.setVerifyRemark(EnumCouponVerifyType.VERIFY_B_12.getMessage()); } } + if(EnumOrderShopingType.SELF_MENTION.getCode().equals(couponOrder.getShippingType())){ + couponOrder.setShippingStatus(EnumOrderShopingStatus.ALREADY_SELF_MENTION.getCode()); + }else if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(couponOrder.getShippingType())){ + couponOrder.setShippingStatus(EnumOrderShopingStatus.ALREADY_DISTRIBUTION.getCode()); + } couponOrder.setUpdateDate(new Date()); num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder); } catch (Exception e) { @@ -546,6 +551,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { try { couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_C.getCode()); + if(EnumOrderShopingType.SELF_MENTION.getCode().equals(couponOrder.getShippingType())){ + couponOrder.setShippingStatus(EnumOrderShopingStatus.ALREADY_SELF_MENTION.getCode()); + }else if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(couponOrder.getShippingType())){ + couponOrder.setShippingStatus(EnumOrderShopingStatus.ALREADY_DISTRIBUTION.getCode()); + } couponOrder.setUpdateDate(new Date()); num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder); } catch (Exception e) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 13c0f65d6..aff12959f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -156,6 +156,9 @@ ,`verify_remark` = #{verifyRemark} + + ,`shipping_status` = #{shippingStatus} + where id=#{id} and `b_user_id` is null and `tenant_id` = #{tenantId} @@ -174,6 +177,9 @@ ,`verify_remark` = #{verifyRemark} + + ,`shipping_status` = #{shippingStatus} + where id=#{id} and `tenant_id` = #{tenantId} @@ -198,6 +204,9 @@ ,`verify_remark` = #{verifyRemark} + + ,`shipping_status` = #{shippingStatus} + where 1=1 and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index ac33b8d66..865cde0ee 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -366,7 +366,7 @@ o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, o.compose_order_type,o.compose_order_id, - o.`freight_price`,o.`shipping_type`,o.`shipping_address`,co.`shipping_status`,co.`delivery_info` + o.`freight_price`,o.`shipping_type`,o.`shipping_address`