Merge branch 'master' into 3.7

src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java

@@ -138,10 +138,24 @@ public class MarketServiceImpl implements MarketService {
 
             if (ListUtil.isNotEmpty(couponCustomerRelevanceList)) {
                 couponCustomerRelevanceList.forEach(couponCustomerRelevance -> {
+                    Integer usedOrderId = couponCustomerRelevance.getOrderId();
+
+
                     couponCustomerRelevance.setOrderId(cmd.getOrderId());
                     //选择使用
                     couponCustomerRelevance.setState(CouponCustomerRelevance.STATE_CHOSE);
                     couponCustomerRelevanceMapper.updateById(couponCustomerRelevance);
+
+                    if (usedOrderId != null) {
+                        this.calcOrderAmount(usedOrderId);
+
+                        //删除这些卡券对应的卡券订单折扣详情
+                        couponOrderRelevanceService.remove(new LambdaQueryWrapper<CouponOrderRelevance>()
+                                .eq(CouponOrderRelevance::getOrderId, usedOrderId)
+                                .eq(CouponOrderRelevance::getCouponCustomerRelevanceId, couponCustomerRelevance.getId()));
+
+
+                    }
                 });
             }
         }

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

@@ -892,6 +892,9 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
         //参数补全
         ScheduleManage scheduleManage = this.setScheduleServe(cmd.getScheduleManageDTO(), cmd.getDefaultNodeList());
 
+        //预约类型：小程序预约
+        scheduleManage.setScheduledType(1);
+
         this.validSubmit(scheduleManage);
 
         //状态 已预约
@@ -1256,8 +1259,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
         Customer customer = customerService.getById(scheduleManage.getScheduledUser());
 
-        //预约类型：小程序预约
-        scheduleManage.setScheduledType(1);
 
         //预约用户手机号
         scheduleManage.setTelephone(customer.getPhone());
@@ -1318,10 +1319,14 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     scheduleServe.setServeType(baseType.getName());
 
                     scheduleServe.setServeNumber(1);
+                    
                     //如果是预约款式
                     if (scheduleServe.getProduceId() != null) {
 
                         BaseProduce baseProduce = baseProduceMapper.selectById(scheduleServe.getProduceId());
+                        if (!baseProduce.getServiceId().equals(scheduleServeCommand.getServeId())) {
+                            throw new RRException("款式不属于当前服务,请重新选择");
+                        }
                         //款式名称
                         scheduleServe.setProduceName(baseProduce.getName());
                         //款式图片

src/main/java/com/gogirl/application/store/career/impl/TechScoreRulesServiceImpl.java

@@ -3,6 +3,7 @@ package com.gogirl.application.store.career.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gogirl.application.store.career.ITechScoreRulesService;
 import com.gogirl.domain.store.career.TechScoreRules;
+import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.config.property.GogirlProperties;
 import com.gogirl.infrastructure.mapper.store.career.CareerMapper;
 import com.gogirl.infrastructure.mapper.store.career.TechScoreRulesMapper;
@@ -12,6 +13,7 @@ import com.gogirl.shared.admin.AchievementsPersonaResultPageApiRequest;
 import com.gogirl.shared.admin.AdminPage;
 import com.gogirl.shared.admin.AdminResult;
 import com.gogirl.shared.store.TechScoreResp;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -34,6 +36,7 @@ import java.util.List;
  * @since 2020-03-12
  */
 @Service
+@Slf4j
 public class TechScoreRulesServiceImpl extends ServiceImpl<TechScoreRulesMapper, TechScoreRules> implements ITechScoreRulesService {
 
     @Resource
@@ -66,6 +69,11 @@ public class TechScoreRulesServiceImpl extends ServiceImpl<TechScoreRulesMapper,
         AdminResult<AdminPage<AchievementsPersonaResult>> result =
                 restTemplate.exchange(gogirlProperties.getAdminBackendAchievementsUrl(), HttpMethod.POST, httpEntity, responseBodyType).getBody();
 
+        if (result == null) {
+            log.error("{},美甲师信息未获取到", SessionUtils.getTechnicianId());
+            throw new RRException("未获取到美甲师评分信息");
+        }
+
         AchievementsPersonaResult achievementsPersonaResult = result.getData().getItems().stream().findAny().orElseThrow(NullPointerException::new);
 
         TechScoreResp techScoreResp = new TechScoreResp();