Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html

@@ -139,7 +139,7 @@
                                         </div>
                                         <div>
                                             <span>票种说明：</span>
-                                            <span th:text="${dict2.title}"></span>
+                                            <span th:text="${dict2.describes}"></span>
                                         </div>
                                         <div th:if="${dict2.isElectronic==1}">
                                             <span>电子票说明：</span>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -126,7 +126,7 @@ public class AdamUserController {
 //        editVo.setBackground(parameter.getBackground());
 //        editVo.setNickname(parameter.getNickname());
         editVo.setAvatar(StringUtils.isEmpty(editVo.getAvatar()) ? avatarDefUrl : editVo.getAvatar());
-        editVo.setBackground(StringUtils.isEmpty(editVo.getBackground()) ? avatarDefUrl : editVo.getBackground());
+        editVo.setBackground(StringUtils.isEmpty(editVo.getBackground()) ? backgroundDefUrl : editVo.getBackground());
         editVo.setNickname(editVo.getNickname());
         editVo.setSex(sex);
         editVo.setBirthday(parameter.getBirthday());

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java

@@ -523,7 +523,7 @@ public class DataImpl {
                     }
 
                     //退款
-                    String refundSql = "select refund_table_id,sum(refund_number) as 'refund_number',sum(refund_price) as 'refund_price' from order_refunds where refund_table = 'order_ticket_entities' and order_id = " + orderData.getInt("id") + " group by refund_table_id"; //设置的预编译语句格式
+                    String refundSql = "select refund_table_id,sum(refund_number) as 'refund_number',sum(refund_price) as 'refund_price' from order_refunds where refund_table = 'order_ticket_entities' and order_id = " + orderData.getInt("id") + " and refund_status = 4 group by refund_table_id"; //设置的预编译语句格式
                     pstmt = con.prepareStatement(refundSql);
                     int refundNumber = 0;
                     BigDecimal refundPrice = new BigDecimal("0.00");