Skip to content

G
gogirl-miniapp-backend
Commit 3c0c44d7 by huluobin
Options

order pay

parent 1b65b5ac
Showing with 80 additions and 33 deletions
src/main/java/com/gogirl/application/xcx/impl/GogirlTokenServiceImpl.java
...@@ -89,7 +89,7 @@ public class GogirlTokenServiceImpl implements GogirlTokenService { ...@@ -89,7 +89,7 @@ public class GogirlTokenServiceImpl implements GogirlTokenService {
} }
if (StringUtils.isNotEmpty(phone)) { if (StringUtils.isNotEmpty(phone)) {
String myQrCode = qrCodeService.myQrCode(customer.getId().toString(), customer.getPhone()); String myQrCode = qrCodeService.myQrCode(customer.getId().toString(), phone);
customer.setMyQrcode(myQrCode); customer.setMyQrcode(myQrCode);
customer.setPhone(phone); customer.setPhone(phone);
} }
......
src/main/java/com/gogirl/domain/store/career/Career.java
...@@ -82,5 +82,6 @@ public class Career { ...@@ -82,5 +82,6 @@ public class Career {
private Double totalAttendancePercent; private Double totalAttendancePercent;
@ApiModelProperty("美甲师评分")
private Integer techScore; private Integer techScore;
} }
src/main/java/com/gogirl/domain/user/customer/Customer.java
...@@ -100,7 +100,7 @@ public class Customer implements Serializable { ...@@ -100,7 +100,7 @@ public class Customer implements Serializable {
@ApiModelProperty("数据完整度") @ApiModelProperty("数据完整度")
private Double dataIntegrity; private Double dataIntegrity;
@ApiModelProperty("1, 大众 2,朋友介绍3, 自来 4,微信 5:街客 6：线上活动'") @ApiModelProperty("1, 大众 2,朋友介绍3, 自来 4,微信 5:街客 6：线上活动 7,街客（逛街）8,街客（附近上班）9, 街客（住附近）")
private Integer customerSource; private Integer customerSource;
@ApiModelProperty("1,新建预约2,新建订单3,微信端授权'") @ApiModelProperty("1,新建预约2,新建订单3,微信端授权'")
......
src/main/java/com/gogirl/dto/TechScore.java
...@@ -7,6 +7,7 @@ import java.util.List; ...@@ -7,6 +7,7 @@ import java.util.List;
@Data @Data
public class TechScore { public class TechScore {
private List<TechScoreRules> techScoreRulesList; private List<TechScoreRules> techScoreRulesList;
private Integer techScore; private Integer techScore;
......
src/main/java/com/gogirl/infrastructure/schedule/Schedule.java
...@@ -45,7 +45,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; ...@@ -45,7 +45,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Date; import java.util.Date;
...@@ -266,7 +265,7 @@ public class Schedule { ...@@ -266,7 +265,7 @@ public class Schedule {
/** /**
* 同步商品销量 * 同步商品销量
*/ */
@Scheduled(cron = "0 0/5 * * * *") @Scheduled(cron = "0 0 3 * * ?")
public void syncProduceSales() { public void syncProduceSales() {
log.debug("同步商品销量** 任务开始"); log.debug("同步商品销量** 任务开始");
BaseFeatures baseFeatures = baseFeaturesMapper.selectOne(new LambdaQueryWrapper<BaseFeatures>().eq(BaseFeatures::getName, "热销款")); BaseFeatures baseFeatures = baseFeaturesMapper.selectOne(new LambdaQueryWrapper<BaseFeatures>().eq(BaseFeatures::getName, "热销款"));
...@@ -302,8 +301,9 @@ public class Schedule { ...@@ -302,8 +301,9 @@ public class Schedule {
orderServeMapper.syncOrderServeTimes(); orderServeMapper.syncOrderServeTimes();
} }
@Scheduled(cron = "0 0/1 * * * *") @Scheduled(cron = "0 0/1 * * * *")
public void weekTest() throws ParseException { public void weekTest() {
log.debug("同步闲时折扣周"); log.debug("同步闲时折扣周");
weekConfigMapper.delete(new LambdaQueryWrapper<>()); weekConfigMapper.delete(new LambdaQueryWrapper<>());
...@@ -322,7 +322,7 @@ public class Schedule { ...@@ -322,7 +322,7 @@ public class Schedule {
/** /**
* 定时同步美甲师成长历程 * 定时同步美甲师成长历程
*/ */
@Scheduled(cron = "0 0/2 * * * *") @Scheduled(cron = "0 0/1 * * * *")
public void syncTechnicianCareer() { public void syncTechnicianCareer() {
log.info("定时同步美甲师成长历程** 任务开始"); log.info("定时同步美甲师成长历程** 任务开始");
...@@ -431,7 +431,7 @@ public class Schedule { ...@@ -431,7 +431,7 @@ public class Schedule {
/** /**
* 定时同步门店数据 * 定时同步门店数据
*/ */
@Scheduled(cron = "0 0/2 * * * *") @Scheduled(cron = "0 0/1 * * * *")
public void syncStoreData() { public void syncStoreData() {
log.info("定时同步门店数据** 任务开始"); log.info("定时同步门店数据** 任务开始");
......
src/main/java/com/gogirl/infrastructure/util/CountCustomerRate.java
...@@ -7,10 +7,18 @@ import com.gogirl.domain.user.customer.CustomerDetail; ...@@ -7,10 +7,18 @@ import com.gogirl.domain.user.customer.CustomerDetail;
import java.math.BigDecimal; import java.math.BigDecimal;
public class CountCustomerRate { public class CountCustomerRate {
/**
* 计算客户资料完整度
*
* @param c
* @param record
* @return
*/
public Double countDataCompleteRate(Customer c, CustomerDetail record) { public Double countDataCompleteRate(Customer c, CustomerDetail record) {
BigDecimal rate = new BigDecimal("0"); BigDecimal rate = new BigDecimal("0");
BigDecimal per10 = new BigDecimal(0.1); BigDecimal per10 = new BigDecimal("0.1");
BigDecimal per4 = new BigDecimal(0.04); BigDecimal per4 = new BigDecimal("0.04");
if (c.getCustomerSource() != null && c.getCustomerSource() != 0) { if (c.getCustomerSource() != null && c.getCustomerSource() != 0) {
rate = rate.add(per10); rate = rate.add(per10);
...@@ -28,35 +36,72 @@ public class CountCustomerRate { ...@@ -28,35 +36,72 @@ public class CountCustomerRate {
rate = rate.add(per10); rate = rate.add(per10);
} }
// if(record!=null&&record.getWechatId ()!=null&&!record.getWechatId ().isEmpty()){rate = rate.add(per4);} if (record != null && record.getWechatId() != null && !record.getWechatId().isEmpty()) {
// if(record!=null&&record.getReferee ()!=null&&!record.getReferee ().isEmpty()){rate = rate.add(per4);} rate = rate.add(per4);
// if(record!=null&&record.getFirstServeTime ()!=null&&!record.getFirstServeTime ().isEmpty()){rate = rate.add(per4);} }
// if(record!=null&&record.getBirthday ()!=null&&!record.getBirthday ().isEmpty()){rate = rate.add(per4);} if (record != null && record.getReferee() != null && !record.getReferee().isEmpty()) {
// if(record!=null&&record.getMaritalStatus ()!=null&&!record.getMaritalStatus ().isEmpty()){rate = rate.add(per4);} rate = rate.add(per4);
// if(record!=null&&record.getHaveChildren ()!=null&&!record.getHaveChildren ().isEmpty()){rate = rate.add(per4);} }
// if(record!=null&&record.getHobby ()!=null&&!record.getHobby ().isEmpty()){rate = rate.add(per4);} if (record != null && record.getFirstServeTime() != null && !record.getFirstServeTime().isEmpty()) {
// if(record!=null&&record.getColourOfSkin ()!=null&&!record.getColourOfSkin ().isEmpty()){rate = rate.add(per4);} rate = rate.add(per4);
// if(record!=null&&record.getTypeOfNailBed ()!=null&&!record.getTypeOfNailBed ().isEmpty()){rate = rate.add(per4);} }
// if(record!=null&&record.getNailType ()!=null&&!record.getNailType ().isEmpty()){rate = rate.add(per4);} if (record != null && record.getBirthday() != null && !record.getBirthday().isEmpty()) {
// if(record!=null&&record.getKeyPointsOfSalon ()!=null&&!record.getKeyPointsOfSalon ().isEmpty()){rate = rate.add(per4);} rate = rate.add(per4);
// if(record!=null&&record.getLikeStyle ()!=null&&!record.getLikeStyle ().isEmpty()){rate = rate.add(per4);} }
// if(record!=null&&record.getCustomerConcerns ()!=null&&!record.getCustomerConcerns ().isEmpty()){rate = rate.add(per4);} if (record != null && record.getMaritalStatus() != null && !record.getMaritalStatus().isEmpty()) {
// if(record!=null&&record.getSolution ()!=null&&!record.getSolution ().isEmpty()){rate = rate.add(per4);} rate = rate.add(per4);
// if(record!=null&&record.getEyelashCondition ()!=null&&!record.getEyelashCondition ().isEmpty()){rate = rate.add(per4);} }
// if(record!=null&&record.getEyeShape ()!=null&&!record.getEyeShape ().isEmpty()){rate = rate.add(per4);} if (record != null && record.getHaveChildren() != null && !record.getHaveChildren().isEmpty()) {
rate = rate.add(per4);
}
if (record != null && record.getHobby() != null && !record.getHobby().isEmpty()) {
rate = rate.add(per4);
}
if (record != null && record.getColourOfSkin() != null && !record.getColourOfSkin().isEmpty()) {
rate = rate.add(per4);
}
if (record != null && record.getTypeOfNailBed() != null && !record.getTypeOfNailBed().isEmpty()) {
rate = rate.add(per4);
}
if (record != null && record.getNailType() != null && !record.getNailType().isEmpty()) {
rate = rate.add(per4);
}
if (record != null && record.getKeyPointsOfSalon() != null && !record.getKeyPointsOfSalon().isEmpty()) {
rate = rate.add(per4);
}
if (record != null && record.getLikeStyle() != null && !record.getLikeStyle().isEmpty()) {
rate = rate.add(per4);
}
if (record != null && record.getCustomerConcerns() != null && !record.getCustomerConcerns().isEmpty()) {
rate = rate.add(per4);
}
if (record != null && record.getSolution() != null && !record.getSolution().isEmpty()) {
rate = rate.add(per4);
}
if (record != null && record.getEyelashCondition() != null && !record.getEyelashCondition().isEmpty()) {
rate = rate.add(per4);
}
if (record != null && record.getEyeShape() != null && !record.getEyeShape().isEmpty()) {
rate = rate.add(per4);
}
if (record != null && record.getLearnAboutUs() != null && !record.getLearnAboutUs().isEmpty()) { if (record != null && record.getLearnAboutUs() != null && !record.getLearnAboutUs().isEmpty()) {
rate = rate.add(per10); rate = rate.add(per10);
} }
// if (record != null && record.getAge() != null && record.getAge() != 0) {
// if(record!=null&&record.getAge ()!=null&&record.getAge ()!=0){rate = rate.add(per4);} rate = rate.add(per4);
// if(record!=null&&record.getNailHardness ()!=null&&record.getNailHardness ()!=0){rate = rate.add(per4);} }
if (record != null && record.getNailHardness() != null && record.getNailHardness() != 0) {
rate = rate.add(per4);
}
if (record != null && record.getResidence() != null && record.getResidence() != 0) { if (record != null && record.getResidence() != null && record.getResidence() != 0) {
rate = rate.add(per10); rate = rate.add(per10);
} }
if (record != null && record.getWorkAddress() != null && record.getWorkAddress() != 0) { if (record != null && record.getWorkAddress() != null && record.getWorkAddress() != 0) {
rate = rate.add(per10); rate = rate.add(per10);
} }
// if(record!=null&&record.getOccupation ()!=null&&record.getOccupation ()!=0){rate = rate.add(per4);} if (record != null && record.getOccupation() != null && record.getOccupation() != 0) {
rate = rate.add(per4);
}
if (record != null && record.getFrequencyOfNail() != null && record.getFrequencyOfNail() != 0) { if (record != null && record.getFrequencyOfNail() != null && record.getFrequencyOfNail() != 0) {
rate = rate.add(per10); rate = rate.add(per10);
} }
......
src/main/resources/application-dev.yml
...@@ -77,7 +77,7 @@ gogirl: ...@@ -77,7 +77,7 @@ gogirl:
end-time: "22:00:00" end-time: "22:00:00"
start-time: "10:00:00" start-time: "10:00:00"
#评论延迟时间 #评论延迟时间
test-paper-time: 1 test-paper-time: 1440
wx: wx:
pay: pay:
......
src/main/resources/application-pre.yml
...@@ -77,7 +77,7 @@ gogirl: ...@@ -77,7 +77,7 @@ gogirl:
end-time: "22:00:00" end-time: "22:00:00"
start-time: "10:00:00" start-time: "10:00:00"
#评论延迟时间 #评论延迟时间
test-paper-time: 1 test-paper-time: 1440
wx: wx:
pay: pay:
......
src/main/resources/application-prod.yml
...@@ -77,7 +77,7 @@ gogirl: ...@@ -77,7 +77,7 @@ gogirl:
end-time: "22:00:00" end-time: "22:00:00"
start-time: "10:00:00" start-time: "10:00:00"
#评论延迟时间 #评论延迟时间
test-paper-time: 1 test-paper-time: 1440
wx: wx:
pay: pay:
......
src/main/resources/application-test.yml
...@@ -77,7 +77,7 @@ gogirl: ...@@ -77,7 +77,7 @@ gogirl:
end-time: "22:00:00" end-time: "22:00:00"
start-time: "10:00:00" start-time: "10:00:00"
#评论延迟时间 #评论延迟时间
test-paper-time: 1 test-paper-time: 1440
wx: wx:
pay: pay:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment