Merge branch 'dev_goblin' of gitlab.zhengzai.tv:dongjingwei/liquidnet-bus-v1 into dev_goblin

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

@@ -801,6 +801,8 @@ create table goblin_back_order
     pre_deposit_pay    int           default 0 comment '是否预存款支付[0-否|1-是]',
     logis_company_name varchar(64)   default '' comment '物流公司名称',
     mail_no            varchar(64)   default '' comment '物流单号',
+    audit_at           datetime      default null comment '审核时间',
+    back_price_express decimal(8, 2) default 0  comment '快递退款金额',
     created_at         datetime,
     updated_at         datetime,
     comment            text,

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

@@ -639,7 +639,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         vo.setMailNo(mailNo);
         vo.setMailId(mailId);
         vo.setOrderId(orderId);
-        redisUtils.changeGoblinMail(orderId, vo);
+        redisUtils.changeGoblinMail(mailId, vo);
         mongoUtils.updateGoblinMailVo(mailId, vo);
         //添加日志
         queueUtils.sendMsgByRedis(