修改 用户申请退款 [待测试]

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinStatusConst.java

@@ -33,8 +33,8 @@ public class GoblinStatusConst {
         ORDER_STATUS_5(5, "取消订单(用户未付款前取消订单)"),
         ORDER_STATUS_6(6, "退款通过(用户已经付款但是商城还未发货，用户发出退款申请，商城同意退款)"),
         ORDER_STATUS_7(7, "退货通过(用户已经确认收货后用户发出退货申请，商城同意所有退货申请 ，一个订单可能有多个单品)"),
-        ORDER_STATUS_61(61, "发起-退款通过(用户已经付款但是商城还未发货，用户发出退款申请，商城同意退款)"),
-        ORDER_STATUS_71(71, "发起-退货通过(用户已经确认收货后用户发出退货申请，商城同意所有退货申请 ，一个订单可能有多个单品)"),
+        ORDER_STATUS_61(61, "发起-退款(用户已经付款但是商城还未发货，用户发出退款申请，商城同意退款)"),
+        ORDER_STATUS_71(71, "发起-退货(用户已经确认收货后用户发出退货申请，商城同意所有退货申请 ，一个订单可能有多个单品)"),
 
         ORDER_LOG_STATUS_11(11, "确认付款"),
         ORDER_LOG_STATUS_12(12, "修改金额"),

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinAppOrderDetailsVo.java

@@ -25,6 +25,11 @@ public class GoblinAppOrderDetailsVo implements Serializable, Cloneable {
     private GoblinStoreOrderVo storeOrderVo;
     @ApiModelProperty(value = " orderSkuVo")
     List<GoblinOrderSkuVo> orderSkuVos;
+    @ApiModelProperty(value = "过期倒计时")
+    private Long restTime;
+    @ApiModelProperty(value = "是否可退款")
+    private int canRefund;
+
     private static final GoblinAppOrderDetailsVo obj = new GoblinAppOrderDetailsVo();
     public static GoblinAppOrderDetailsVo getNew() {
         try {

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinAppOrderListVo.java

@@ -31,6 +31,12 @@ public class GoblinAppOrderListVo implements Serializable, Cloneable {
     private String storeName;
     @ApiModelProperty(value = " 订单状态[0-待付款(用户刚下单)|2-代发货(用户付完款 等待商城发货)3-代收货(商城已经发货 等待用户确认收货)|4-已完成(用户已经确认收货 订单结束)|5-取消订单(用户未付款前取消订单)|6-退款通过(用户已经付款但是商城还未发货，用户发出退款申请，商城同意退款)|7-退货通过(用户已经确认收货后用户发出退货申请，商城同意所有退货申请 ，一个订单可能有多个单品)]")
     private Integer status;
+    @ApiModelProperty(value = "过期倒计时", example = "")
+    private Long restTime;
+    @ApiModelProperty(value = "活动id")
+    private String marketId;
+    @ApiModelProperty(value = "活动类型[ZZ-正在下单]")
+    private String marketType;
     @ApiModelProperty(value = " sku")
     List<GoblinOrderSkuVo> orderSkuVos;
     private static final GoblinAppOrderListVo obj = new GoblinAppOrderListVo();

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderVo.java

@@ -98,6 +98,10 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
     private String paymentId;
     @ApiModelProperty(value = " paymentType")
     private String paymentType;
+    @ApiModelProperty(value = " 活动类型[ZZ-正在下单]")
+    private String marketType;
+    @ApiModelProperty(value = " 活动id")
+    private String marketId;
     @ApiModelProperty(value = " 创建时间")
     private String createdAt;
 

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinStoreOrder.java

@@ -296,6 +296,16 @@ public class GoblinStoreOrder implements Serializable,Cloneable {
      */
     private String logisticsCode;
 
+    /**
+     * 活动类型
+     */
+    private String marketType;
+
+    /**
+     * 活动id
+     */
+    private String marketId;
+
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java

@@ -196,10 +196,14 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         BigDecimal voucherMarket = BigDecimal.ZERO;//活动优惠金额
         String writeOffCode = ""; //取货码
         List<GoblinOrderSku> goblinOrderSkuList = ObjectUtil.getGoblinOrderSkuArrayList();
+        String marketId = "";
+        String marketType = "";
         for (GoblinOrderSkuParam skuParam : storeParam.getGoblinOrderSkuParamArrayList()) {
             String pre = GoblinStatusConst.MarketPreStatus.getPre(skuParam.getSkuId());
             GoblinGoodsSkuInfoVo skuVo = redisUtils.getGoodsSkuInfoVo(skuParam.getSkuId());
             GoblinGoodsInfoVo spuVo = redisUtils.getGoodsInfoVo(skuParam.getSpuId());
+            marketId = spuVo.getMarketId();
+            marketType = pre;
             skuName = skuName.concat(skuVo.getName()).concat(",");
             if (pre != null && pre.contains(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue())) {
                 writeOffCode = "EMPTY";
@@ -286,6 +290,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         storeOrder.setPayCountdownMinute(5);
         storeOrder.setIpAddress(CurrentUtil.getCliIpAddr());
         storeOrder.setCreatedAt(now);
+        storeOrder.setMarketId(marketId);
+        storeOrder.setMarketType(marketType);
+
         //订单attr
         GoblinOrderAttr orderAttr = GoblinOrderAttr.getNew();
         orderAttr.setOrderAttrId(IDGenerator.nextTimeId2());
@@ -391,7 +398,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             sqlDataOrder.add(new Object[]{
                     storeOrder.getMasterOrderCode(), storeOrder.getOrderId(), storeOrder.getStoreId(), storeOrder.getStoreName(), storeOrder.getOrderCode(), storeOrder.getUserId(), storeOrder.getUserName(), storeOrder.getUserMobile(), storeOrder.getPriceTotal(),
                     storeOrder.getPriceActual(), storeOrder.getPriceRefund(), storeOrder.getPriceExpress(), storeOrder.getPriceCoupon(), storeOrder.getPriceVoucher(), storeOrder.getStatus(), storeOrder.getUcouponId(), storeOrder.getPayType(), storeOrder.getDeviceFrom(),
-                    storeOrder.getSource(), storeOrder.getVersion(), storeOrder.getIsMember(), storeOrder.getOrderType(), storeOrder.getWriteOffCode(), storeOrder.getPayCountdownMinute(), storeOrder.getIpAddress(), storeOrder.getPayCode(), storeOrder.getCreatedAt()
+                    storeOrder.getSource(), storeOrder.getVersion(), storeOrder.getIsMember(), storeOrder.getOrderType(), storeOrder.getWriteOffCode(), storeOrder.getPayCountdownMinute(), storeOrder.getIpAddress(), storeOrder.getPayCode(), storeOrder.getMarketId(),storeOrder.getMarketType(),storeOrder.getCreatedAt()
             });
             GoblinOrderAttr orderAttr = item.getOrderAttr();
             sqlDataAttr.add(new Object[]{

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreBackOrderServiceImpl.java

@@ -7,12 +7,8 @@ import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.*;
-import com.liquidnet.service.goblin.entity.GoblinBackOrder;
 import com.liquidnet.service.goblin.entity.GoblinBackOrderLog;
-import com.liquidnet.service.goblin.entity.GoblinOrderOperationLog;
-import com.liquidnet.service.goblin.param.RefundCallbackParam;
 import com.liquidnet.service.goblin.service.manage.IGoblinStoreBackOrderService;
-import com.liquidnet.service.goblin.service.manage.IGoblinStoreOrderService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import com.liquidnet.service.goblin.util.ObjectUtil;
@@ -27,7 +23,6 @@ import org.springframework.util.MultiValueMap;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 
 @Service
@@ -212,7 +207,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
         //mysql
         queueUtils.sendMsgByRedis(
                 MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
-                SqlMapping.get("goblin_order.store.changeStatus",
+                SqlMapping.get("goblin_order.store.backOrderStatus",
                         backOrderVo.getStatus(), now,
                         backOrderId, now, now
                 )

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -54,7 +54,7 @@ goblin.self.market.insertRelation=INSERT INTO goblin_marketing_zhengzai (`zhengz
 goblin.self.market.updateRelation=UPDATE goblin_marketing_zhengzai SET price_marketing=? ,stock_marketing=? , buy_factor=?,buy_roster=?,buy_limit=?,updated_at=? WHERE self_market_id =? and store_id =?
 goblin.self.market.delSpuRelation=UPDATE goblin_marketing_zhengzai SET del_flag = ?,updated_at = ? WHERE self_market_id =? and store_id =? and spu_id=?
 #----                   订单创建&支付
-goblin.order.create.order_insert=INSERT INTO goblin_store_order (`master_order_code`,`order_id`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_actual`,`price_refund`,`price_express`,`price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`write_off_code`,`pay_countdown_minute`,`ip_address`,`pay_code`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin.order.create.order_insert=INSERT INTO goblin_store_order (`master_order_code`,`order_id`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_actual`,`price_refund`,`price_express`,`price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`write_off_code`,`pay_countdown_minute`,`ip_address`,`pay_code`,`market_id`,`market_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin.order.create.attr_insert=INSERT INTO goblin_order_attr (`order_attr_id`,`order_id`,`express_contacts`,`express_address`,`express_address_detail`,`express_phone`,`express_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?)
 goblin.order.create.sku_insert=INSERT INTO goblin_order_sku (`order_sku_id`,`order_id`,`spu_id`,`spu_name`,`spu_pic`,`sku_id`,`num`,`sku_price`,`sku_price_actual`,`sku_name`,`sku_no`,`sku_image`,`sku_specs`,`price_voucher`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin_order.pay.order=UPDATE goblin_store_order SET payment_type = ? ,payment_id=?,pay_code = ? ,pay_time = ?,write_off_code = ? ,status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
@@ -79,7 +79,9 @@ goblin_order.store.refundSkuPrice=UPDATE goblin_order_sku SET price_refund = ? ,
 goblin_order.store.refundBackOrder=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.changeExpress=UPDATE goblin_back_order SET real_back_price = ? ,back_price_express = ? updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.changeSku=UPDATE goblin_back_order SET real_back_price = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-goblin_order.store.changeStatus=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.store.backOrderStatus=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.store.orderStatus=UPDATE goblin_store_order SET status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+
 goblin_order.store.applyRefund=UPDATE goblin_back_order SET status = ? ,reason=?, updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)