Commit 90e1b708 by huluobin

得分规则 企业微信webhook

parent 8a6af25e
...@@ -12,6 +12,7 @@ import com.gogirl.infrastructure.mapper.order.market.TimesCardOrderMapper; ...@@ -12,6 +12,7 @@ import com.gogirl.infrastructure.mapper.order.market.TimesCardOrderMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
...@@ -32,6 +33,8 @@ public class TimesCardOrderServiceImpl extends ServiceImpl<TimesCardOrderMapper, ...@@ -32,6 +33,8 @@ public class TimesCardOrderServiceImpl extends ServiceImpl<TimesCardOrderMapper,
private final TimesCardTypeMapper timesCardTypeMapper; private final TimesCardTypeMapper timesCardTypeMapper;
private final TimesCardCustomerRelevanceMapper timesCardCustomerRelevanceMapper; private final TimesCardCustomerRelevanceMapper timesCardCustomerRelevanceMapper;
@Transactional(rollbackFor = Exception.class)
@Override @Override
public void notifyTimesCardOrder(WxPayOrderNotifyResult result) { public void notifyTimesCardOrder(WxPayOrderNotifyResult result) {
String attach = result.getAttach(); String attach = result.getAttach();
......
...@@ -72,7 +72,7 @@ public class TechScoreRulesServiceImpl extends ServiceImpl<TechScoreRulesMapper, ...@@ -72,7 +72,7 @@ public class TechScoreRulesServiceImpl extends ServiceImpl<TechScoreRulesMapper,
techScoreResp.setTechScore(achievementsPersonaResult.getMonth_score().doubleValue()); techScoreResp.setTechScore(achievementsPersonaResult.getMonth_score().doubleValue());
List<TechScoreRules> techScoreRulesList = new ArrayList<>(); List<TechScoreRules> techScoreRulesList = new ArrayList<>();
String card = String.format("开卡得分:%s。开卡率:%s。权重:%s。规则:20%%该项满分、5%%该项0分。可以超过100分", String card = String.format("开卡得分:%s。开卡率:%s%%。权重:%s。规则:20%%该项满分、5%%该项0分。可以超过100分",
achievementsPersonaResult.getActivate_a_card_score().toString(), achievementsPersonaResult.getActivate_a_card_score().toString(),
achievementsPersonaResult.getActivate_a_card_val().toString() achievementsPersonaResult.getActivate_a_card_val().toString()
, achievementsPersonaResult.getActivate_a_card_proportion_str()); , achievementsPersonaResult.getActivate_a_card_proportion_str());
...@@ -80,7 +80,7 @@ public class TechScoreRulesServiceImpl extends ServiceImpl<TechScoreRulesMapper, ...@@ -80,7 +80,7 @@ public class TechScoreRulesServiceImpl extends ServiceImpl<TechScoreRulesMapper,
techScoreRulesList.add(t1); techScoreRulesList.add(t1);
//好评得分 //好评得分
String comment = String.format("好评率得分:%s。好评率:%s。权重:%s。规则:分数=好评(>3星)数/总评论数*100,评论包括所有渠道投诉。" String comment = String.format("好评率得分:%s。好评率:%s%%。权重:%s。规则:分数=好评(>3星)数/总评论数*100,评论包括所有渠道投诉。"
, achievementsPersonaResult.getPraise_score().toString() , achievementsPersonaResult.getPraise_score().toString()
, achievementsPersonaResult.getPraise_val().toString() , achievementsPersonaResult.getPraise_val().toString()
, achievementsPersonaResult.getPraise_proportion_str()); , achievementsPersonaResult.getPraise_proportion_str());
......
...@@ -124,6 +124,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i ...@@ -124,6 +124,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
final String openid = gogirlToken.getOpenid(); final String openid = gogirlToken.getOpenid();
if (openid == null) {
throw new RRException("微信登录失败,请重试");
}
try { try {
lock.lock(openid.hashCode() & Integer.MAX_VALUE); lock.lock(openid.hashCode() & Integer.MAX_VALUE);
//变量为当前登陆用户 //变量为当前登陆用户
......
...@@ -81,7 +81,6 @@ gogirl: ...@@ -81,7 +81,6 @@ gogirl:
notify-refund-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder" notify-refund-mall-order: "http://www.begogirls.com/customer/mallOrderPay/notifyRefundMallOrder"
#微信余额支付回调接口 #微信余额支付回调接口
notify-balance-wx-pay: "http://www.begogirls.com/customer/pay/notifyBalanceWxPay" notify-balance-wx-pay: "http://www.begogirls.com/customer/pay/notifyBalanceWxPay"
#服务器图片临时地址 #服务器图片临时地址
picture-path: /upload/grouppic/ picture-path: /upload/grouppic/
...@@ -93,13 +92,20 @@ gogirl: ...@@ -93,13 +92,20 @@ gogirl:
test-paper-time: 1440 test-paper-time: 1440
#后台后端接口访问地址 #后台后端接口访问地址
admin-backend-url: http://admin.begogirls.com:7712/api/ReportTable/GetTechnicianPageApi admin-backend-url: http://admin.begogirls.com:7712/api/ReportTable/GetTechnicianPageApi
#后台接口地址
admin-backend-achievements-url: http://admin.begogirls.com:7712/api/salary/AchievementsPersonaResultPageApi admin-backend-achievements-url: http://admin.begogirls.com:7712/api/salary/AchievementsPersonaResultPageApi
enterprise-wechat-webhook: "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=e687de79-143e-4c28-8db4-e6058722f286" #企业微信预约消息推送
enterprise-wechat-webhook: "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=739e065a-2352-4cfb-bbf3-ffe1dc8b0818"
wx: wx:
pay: pay:
# 支付appid
appId: wx058b46db3cd0e979 appId: wx058b46db3cd0e979
#商户id
mchId: 1515628551 mchId: 1515628551
#商户Key
mchKey: gogirl2018gogirl2018gogirl2018go mchKey: gogirl2018gogirl2018gogirl2018go
#证书 这个是企业转账需要的 现在还没配置
keyPath: "/usr/local/src/gogirl/gogirl-payment/apiclient_cert.p12" keyPath: "/usr/local/src/gogirl/gogirl-payment/apiclient_cert.p12"
server: server:
......
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