Merge branch 'master' into branch

# Conflicts:
#	src/main/resources/application-dev.yml

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -921,7 +921,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
         log.info("更新预约:{}", cmd);
 
-
         ScheduleManage scheduleManage = this.setScheduleServe(cmd.getScheduleManageDTO(), cmd.getDefaultNodeList());
         if (SessionUtils.isSourceFromCustomer()) {
             this.validSubmit(scheduleManage);

src/main/java/com/gogirl/domain/order/mall/MallOrderAddress.java

@@ -31,6 +31,7 @@ public class MallOrderAddress {
     @ApiModelProperty("地区")
     private String area;
 
+    @ApiModelProperty("街道")
     private String street;
 
     @ApiModelProperty("收货物手机号")

src/main/java/com/gogirl/domain/store/oa/TakeLeaveEvent.java

@@ -24,6 +24,7 @@ public class TakeLeaveEvent {
     public static final Integer STATUS_UN_APPROVAL = 1;
     public static final Integer STATUS_APPROVAL_PASS = 2;
     public static final Integer STATUS_APPROVAL_REFUSE = 3;
+
     /**
      * type
      */
@@ -41,7 +42,7 @@ public class TakeLeaveEvent {
     @ApiModelProperty("请假美甲师id")
     private Integer applyTechnicianId;
 
-    @ApiModelProperty("1-加班 2-调休 3-事假 4-病假 5-外出 6-婚假 7-生日假")
+    @ApiModelProperty("1-加班 2-调休 3-事假 4-病假 5-外出 6-年假 7-生日假")
     private Integer type;
 
     @ApiModelProperty("开始时间")

src/main/java/com/gogirl/infrastructure/mapper/user/customer/CustomerBalanceRecordMapper.java

@@ -40,4 +40,8 @@ public interface CustomerBalanceRecordMapper extends BaseMapper<CustomerBalanceR
      */
     Page<CustomerBalanceRecord> queryPageAchieve(Page<CustomerBalanceRecord> page, @Param("technicianId") Integer technicianId, @Param("month") String month);
 
+    /**
+     * 定时同步余额为0的用户为普通会员
+     */
+    void syncBalanceLevel();
 }

src/main/java/com/gogirl/infrastructure/schedule/Schedule.java

@@ -632,4 +632,12 @@ public class Schedule {
         });
         log.info("评价提醒推送定时任务结束");
     }
+
+    /**
+     * 每分钟同步余额为0的会员为普通会员
+     */
+    @Scheduled(cron = "0 0/1 * * * *")
+    public void syncBalanceLevel() {
+        balanceRecordDao.syncBalanceLevel();
+    }
 }

src/main/java/com/gogirl/infrastructure/util/lock/CustomerIdLock.java

@@ -4,9 +4,11 @@ import java.util.HashMap;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- *  * 分段锁，系统提供一定数量的原始锁，根据传入用户id值获取对应的锁并加锁  * 注意：要锁的用户id值如果发生改变，有可能导致锁无法成功释放!!!
+ * 分段锁，系统提供一定数量的原始锁，根据传入用户id值获取对应的锁并加锁
+ * 注意：要锁的用户id值如果发生改变，有可能导致锁无法成功释放!!!
  */
 public class CustomerIdLock {
+
     private final static HashMap<Integer, ReentrantLock> lockMap = new HashMap<>();
     private Integer segments = 500;// 默认分段数量
 

src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java

@@ -115,8 +115,13 @@ public class OrderManageController {
     @ApiOperation(value = "查询订单")
     @GetMapping(value = "/customer/ordermanage/queryOrderForComment")
     public JsonResult<OrderManage> queryOrderForComment(@RequestParam Integer id) {
-        OrderManage orderManage = orderManageService.queryOrderForComment(id);
-        return JsonResult.success(orderManage);
+        try {
+            //外层兜底处理查询历史订单
+            OrderManage orderManage = orderManageService.queryOrderForComment(id);
+            return JsonResult.success(orderManage);
+        } catch (Exception e) {
+            throw new RRException("您已经评价过该订单");
+        }
     }
 
 

src/main/resources/application.yml

 spring:
   profiles:
-    active: pre
+    active: dev
   servlet:
     #文件上传最大容量
     multipart:

src/main/resources/mapper/user/CustomerBalanceRecordMapper.xml

@@ -36,6 +36,14 @@
     </sql>
 
 
+    <update id="syncBalanceLevel">
+        update customer_balance
+        set `level` ='普通会员'
+        where balance = 0
+          and `level` != '普通会员'
+    </update>
+
+
     <select id="getBalanceRecordCard" resultMap="BaseResultMap"
             parameterType="com.gogirl.domain.user.customer.CustomerBalanceRecord">
         SELECT t1.*