| @@ -2186,6 +2186,7 @@ public class PosServiceImpl implements PosService { | |||||
| updateCO.setId(couponOrderId); | updateCO.setId(couponOrderId); | ||||
| updateCO.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); | updateCO.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); | ||||
| updateCO.setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode()); | updateCO.setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode()); | ||||
| couponOrderMapper.updateById(updateCO); | couponOrderMapper.updateById(updateCO); | ||||
| } | } | ||||
| WxCouponOrderCVo couponOrderCVo = couponOrderService.detailCUserVo(posPayOrderNo,merchantBUser); | WxCouponOrderCVo couponOrderCVo = couponOrderService.detailCUserVo(posPayOrderNo,merchantBUser); | ||||
| @@ -462,6 +462,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| couponOrder.setVerifyRemark(EnumCouponVerifyType.VERIFY_B_12.getMessage()); | 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()); | couponOrder.setUpdateDate(new Date()); | ||||
| num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder); | num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -546,6 +551,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| try { | try { | ||||
| couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 | couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 | ||||
| couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_C.getCode()); | 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()); | couponOrder.setUpdateDate(new Date()); | ||||
| num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder); | num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -156,6 +156,9 @@ | |||||
| <if test=" null != verifyRemark"> | <if test=" null != verifyRemark"> | ||||
| ,`verify_remark` = #{verifyRemark} | ,`verify_remark` = #{verifyRemark} | ||||
| </if> | </if> | ||||
| <if test=" null != shippingStatus"> | |||||
| ,`shipping_status` = #{shippingStatus} | |||||
| </if> | |||||
| where id=#{id} and `b_user_id` is null | where id=#{id} and `b_user_id` is null | ||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| @@ -174,6 +177,9 @@ | |||||
| <if test=" null != verifyRemark"> | <if test=" null != verifyRemark"> | ||||
| ,`verify_remark` = #{verifyRemark} | ,`verify_remark` = #{verifyRemark} | ||||
| </if> | </if> | ||||
| <if test=" null != shippingStatus"> | |||||
| ,`shipping_status` = #{shippingStatus} | |||||
| </if> | |||||
| where id=#{id} | where id=#{id} | ||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| @@ -198,6 +204,9 @@ | |||||
| <if test=" null != verifyRemark"> | <if test=" null != verifyRemark"> | ||||
| ,`verify_remark` = #{verifyRemark} | ,`verify_remark` = #{verifyRemark} | ||||
| </if> | </if> | ||||
| <if test=" null != shippingStatus"> | |||||
| ,`shipping_status` = #{shippingStatus} | |||||
| </if> | |||||
| where 1=1 | where 1=1 | ||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| @@ -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, | 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, | 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.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` | |||||
| </sql> | </sql> | ||||
| <select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="CVoResultMap"> | <select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="CVoResultMap"> | ||||