Merge branch 'jxl-datongfensi' into test-ecs

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

@@ -315,7 +315,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
             backOrder.setDescribes(param.getDescribes());
             backOrder.setSkuIdNums(Joiner.on(",").join(orderVo.getOrderSkuVoIds()));
         } else if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_4.getValue()) {//已完成
-            if (param.getOrderSkuId() != null) {
+            if (StringUtil.isNotBlank(param.getOrderSkuId())) {
                 GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(param.getOrderSkuId());
                 if (orderVo.getPriceRefund().add(orderSkuVo.getSkuPriceActual()).add(orderVo.getPriceExpress()).compareTo(orderVo.getPriceActual()) >= 0) {
                     backOrder.setRealBackPrice(orderSkuVo.getSkuPriceActual().add(orderVo.getPriceExpress()));