修改 各种文案显示 退款重复点击 如果 退款成功则不改退款单状态

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

@@ -48,6 +48,8 @@ public class GoblinBackOrderVo implements Serializable, Cloneable {
     private String reason;
     @ApiModelProperty(value = "退款拒绝原因")
     private String refuseReason;
+    @ApiModelProperty(value = "退款失败原因")
+    private String errorReason;
     @ApiModelProperty(value = "问题说明")
     private String describes;
     @ApiModelProperty(value = "申请凭据[0-没有任何凭据|1-有发票|2-有质检报告]")

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

@@ -125,6 +125,8 @@ public class GoblinBackOrder implements Serializable, Cloneable {
 
     private String refuseReason;
 
+    private String errorReason;
+
     private LocalDateTime auditAt;
 
     private LocalDateTime expireAt;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_ln_goblin_initialdata.sql

@@ -983,7 +983,7 @@ alter table goblin_back_order add refuse_at datetime default null comment '拒
 alter table goblin_back_order add refuse_size int default 0 comment '拒绝次数';
 alter table goblin_back_order add audit_at datetime default null comment '审核时间';
 alter table goblin_back_order add refuse_reason varchar(255) default '' comment '退款原因';
-
+alter table goblin_back_order add error_reason varchar(255) default '' comment '退款失败原因';
 
 alter table goblin_back_order_log add operation_name varchar(255) default '' comment '操作人姓名';
 # -- >>------------------------------------------------------------------------------------

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

@@ -383,14 +383,14 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         GoblinOrderAttr orderAttr = GoblinOrderAttr.getNew();
         orderAttr.setOrderAttrId(IDGenerator.nextTimeId2());
         orderAttr.setOrderId(orderId);
-        if (!writeOffCode.equals("EMPTY")) {
-            orderAttr.setExpressContacts(addressesVo.getName());
-            orderAttr.setExpressAddress(addressesVo.getProvince() + "," + addressesVo.getCounty() + "," + addressesVo.getCity());
-            orderAttr.setExpressAddressDetail(addressesVo.getAddress());
-            orderAttr.setExpressPhone(addressesVo.getPhone());
-            orderAttr.setExpressType(1);
-            orderAttr.setCreatedAt(now);
-        }
+//        if (!writeOffCode.equals("EMPTY")) {
+//            orderAttr.setExpressContacts(addressesVo.getName());
+//            orderAttr.setExpressAddress(addressesVo.getProvince() + "," + addressesVo.getCounty() + "," + addressesVo.getCity());
+//            orderAttr.setExpressAddressDetail(addressesVo.getAddress());
+//            orderAttr.setExpressPhone(addressesVo.getPhone());
+//            orderAttr.setExpressType(1);
+//            orderAttr.setCreatedAt(now);
+//        }
         //返回值
         GoblinOrderPreParam preParam = GoblinOrderPreParam.getNew();
         preParam.setPriceActual(storeOrder.getPriceActual());

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

@@ -457,10 +457,12 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         Boolean success = (Boolean) hashMapResult.get("success");
         String message = (String) hashMapResult.get("message");
         if (!success) {
+            if (!(backOrderVo.getStatus() == GoblinStatusConst.Status.ORDER_BACK_STATUS_8.getValue() || backOrderVo.getStatus() == GoblinStatusConst.Status.ORDER_BACK_STATUS_2.getValue())) {
                 backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_10.getValue());
-            backOrderVo.setReason(backOrderVo.getReason() + ",失败原因：" + message);
+                backOrderVo.setErrorReason(backOrderVo.getErrorReason() + ",失败原因：" + message);
                 log.error("REFUND DATA = " + returnString);
             }
+        }
         //redis
         redisUtils.setBackOrderVo(backOrderVo.getBackOrderId(), backOrderVo);
         redisUtils.addBackOrderByOrderId(orderVo.getOrderId(), backOrderVo.getBackOrderId());
@@ -474,7 +476,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                         goblinBackOrder.getOrderCode(), goblinBackOrder.getStoreId(), goblinBackOrder.getUserId(),
                         goblinBackOrder.getSkuIdNums(), goblinBackOrder.getType(), goblinBackOrder.getReason(),
                         goblinBackOrder.getDescribes(), goblinBackOrder.getRealBackPrice(), goblinBackOrder.getStatus(),
-                        goblinBackOrder.getCreatedAt(), goblinBackOrder.getAuditAt()
+                        goblinBackOrder.getCreatedAt(), goblinBackOrder.getAuditAt(), goblinBackOrder.getErrorReason()
                 )
         );
         //添加日志

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

@@ -63,7 +63,7 @@ public class GoblinOrderUtils {
         if (buyCount + number > limitCount) {
             return "已超出限购数量";
         } else {
-            redisUtils.incrSkuCountByUid(uid, skuId, number);
+            int a = redisUtils.incrSkuCountByUid(uid, skuId, number);
             return "";
         }
     }

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

@@ -94,7 +94,7 @@ goblin_order.store.orderSkuPrice=UPDATE goblin_order_sku SET price_modify = ? ,p
 goblin_order.store.log=INSERT INTO goblin_order_operation_log (`order_log_id`,`order_id`,`type`,`remark`,`operation_name`,`created_at`) VALUES(?,?,?,?,?,?)
 goblin_order.store.refundLog=INSERT INTO goblin_back_order_log (`back_order_log_id`,`back_order_id`,`operation_type`,`message`,`operation_name`,`status`,`created_at`) VALUES(?,?,?,?,?,?,?)
 goblin_order.store.orderExpressPrice=UPDATE goblin_store_order SET price_total =? , price_modify = ? ,price_voucher = ? , price_actual = ? ,price_express = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-goblin_order.store.backOrder=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`status`,`created_at`,`audit_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_order.store.backOrder=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`status`,`created_at`,`audit_at`,`error_reason`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin_order.store.refundPrice=UPDATE goblin_store_order SET price_refund = ? ,status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.refundSkuPrice=UPDATE goblin_order_sku SET price_refund = ? ,status = ? ,  updated_at = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.refundBackOrder=UPDATE goblin_back_order SET status = ? ,refund_at=?, updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)