Просмотр исходного кода

Merge branch 'release_toaliyun_real_202212' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202212

release_toaliyun_real
zhengfangyuan 3 лет назад
Родитель
Сommit
13c31f925c
12 измененных файлов: 46 добавлений и 43 удалений
  1. +21
    -20
      mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java
  2. +1
    -0
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java
  3. +4
    -4
      mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java
  4. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java
  5. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java
  6. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java
  7. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java
  8. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java
  9. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java
  10. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java
  11. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java
  12. +4
    -3
      mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java

+ 21
- 20
mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java Просмотреть файл

@@ -211,26 +211,27 @@ public class TtPayController extends BaseController {
refund_amount = (Integer) pMap.get("refund_amount"); refund_amount = (Integer) pMap.get("refund_amount");
} }


Map<String,String> map = new HashMap<>();
map.put("tenantId",tenantId);
map.put("appid",appid);
map.put("cp_refundno",cp_refundno);
map.put("status",status);
map.put("refund_amount",refund_amount.toString());
// wxRefundOrderService.notify(map, EnumPayWay.PAY_WAY_TT);

String jsonMsg = JSON.toJSONString(map);

FmInsideNotifyRefundSuccessMsg refundSuccessMsg = new FmInsideNotifyRefundSuccessMsg();
refundSuccessMsg.setTenantId(tenantId);
refundSuccessMsg.setMsgType(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode());
refundSuccessMsg.setDelayTimeLevel(3);
refundSuccessMsg.setPayWay(EnumPayWay.PAY_WAY_TT.getCode());
refundSuccessMsg.setPayVersion(EnumPayVersion.DY_PAY_V2.getCode());
refundSuccessMsg.setJsonMsg(jsonMsg);

// response = wxRefundOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP);
mqBaseProducer.sendMessage(refundSuccessMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
//todo 抖音退款不通过回调处理,通过定时处理
// Map<String,String> map = new HashMap<>();
// map.put("tenantId",tenantId);
// map.put("appid",appid);
// map.put("cp_refundno",cp_refundno);
// map.put("status",status);
// map.put("refund_amount",refund_amount.toString());
//// wxRefundOrderService.notify(map, EnumPayWay.PAY_WAY_TT);
//
// String jsonMsg = JSON.toJSONString(map);
//
// FmInsideNotifyRefundSuccessMsg refundSuccessMsg = new FmInsideNotifyRefundSuccessMsg();
// refundSuccessMsg.setTenantId(tenantId);
// refundSuccessMsg.setMsgType(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode());
// refundSuccessMsg.setDelayTimeLevel(3);
// refundSuccessMsg.setPayWay(EnumPayWay.PAY_WAY_TT.getCode());
// refundSuccessMsg.setPayVersion(EnumPayVersion.DY_PAY_V2.getCode());
// refundSuccessMsg.setJsonMsg(jsonMsg);
//
// // response = wxRefundOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP);
// mqBaseProducer.sendMessage(refundSuccessMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());


resultMap.put("err_no",0); resultMap.put("err_no",0);
resultMap.put("err_tips","success"); resultMap.put("err_tips","success");


+ 1
- 0
mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java Просмотреть файл

@@ -154,6 +154,7 @@ public class WxPayController extends BaseController {
xml = IOUtils.toString(request.getInputStream(), Charset.forName("UTF-8")); xml = IOUtils.toString(request.getInputStream(), Charset.forName("UTF-8"));
logger.info(xml); logger.info(xml);
paramMap = WxPayment.xmlToMap(xml); paramMap = WxPayment.xmlToMap(xml);
paramMap.put("tenantId", tenantId);
String jsonMsg = JSON.toJSONString(paramMap); String jsonMsg = JSON.toJSONString(paramMap);


FmInsideNotifyRefundSuccessMsg refundSuccessMsg = new FmInsideNotifyRefundSuccessMsg(); FmInsideNotifyRefundSuccessMsg refundSuccessMsg = new FmInsideNotifyRefundSuccessMsg();


+ 4
- 4
mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java Просмотреть файл

@@ -60,8 +60,8 @@ public class InvestSchedule {
private static final String TAG_REMIND = "招商定时任务-提醒"; private static final String TAG_REMIND = "招商定时任务-提醒";




@Async
@Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务
// @Async
// @Scheduled(cron = "0 0 14 * * ?") // 每天下午两点执行定时任务
//@Scheduled(cron = "0 */30 * * * *?") // 测试,每30分钟执行 //@Scheduled(cron = "0 */30 * * * *?") // 测试,每30分钟执行
public void messageSchedule() { public void messageSchedule() {
log.info("{}: 开始", TAG_MESSAGE); log.info("{}: 开始", TAG_MESSAGE);
@@ -72,8 +72,8 @@ public class InvestSchedule {
log.info("{}: 结束", TAG_MESSAGE); log.info("{}: 结束", TAG_MESSAGE);
} }


@Async
@Scheduled(cron = "0 */5 * * * *?")
// @Async
// @Scheduled(cron = "0 */5 * * * *?")
public void remindSchedule() { public void remindSchedule() {
log.info("{}: 开始", TAG_REMIND); log.info("{}: 开始", TAG_REMIND);
// 提醒新 // 提醒新


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/OrderRefundAuditSchedule.java Просмотреть файл

@@ -43,7 +43,7 @@ public class OrderRefundAuditSchedule {
MaUtil maUtil; MaUtil maUtil;


@Async @Async
@Scheduled(cron = "0 */5 * * * ?")//
@Scheduled(cron = "0 40 */1 * * ?")//
//@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次
public void orderQueryRefund() { public void orderQueryRefund() {


@@ -131,7 +131,7 @@ public class OrderRefundAuditSchedule {
return wxAppinfoMapper.findList(appinfo); return wxAppinfoMapper.findList(appinfo);
} }


@Async
@Scheduled(cron = "0 30 */1 * * ?")// 每个小时的30分钟 @Scheduled(cron = "0 30 */1 * * ?")// 每个小时的30分钟
//@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次
public void merchantAuditCallback() { public void merchantAuditCallback() {


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/PowerBillAutoBuildSchedule.java Просмотреть файл

@@ -61,8 +61,8 @@ public class PowerBillAutoBuildSchedule {
/** /**
* 每天5点执行 * 每天5点执行
*/ */
@Async
@Scheduled(cron = "0 0 5 * * ?")
// @Async
// @Scheduled(cron = "0 0 5 * * ?")
public void powerBillAutoConfigStart() { public void powerBillAutoConfigStart() {
logger.info("自动生成电费账单开始...."); logger.info("自动生成电费账单开始....");
int dayOfMonth = LocalDate.now().getDayOfMonth(); int dayOfMonth = LocalDate.now().getDayOfMonth();


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java Просмотреть файл

@@ -48,8 +48,8 @@ public class SharingOrderRedoSchedule {
} }
@Async @Async
// @Scheduled(cron = "0 0 2 * * ?") // 每天凌晨02:00分账重试
@Scheduled(cron = "0 15 */2 * * ?")// 每2个小时的15分钟
@Scheduled(cron = "0 15 2 * * ?") // 每天凌晨02:00分账重试
// @Scheduled(cron = "0 15 */2 * * ?")// 每2个小时的15分钟
// @Scheduled(cron = "0 0/10 * * * ?") // 测试 // @Scheduled(cron = "0 0/10 * * * ?") // 测试
public void sharingOrderRedoSchedule() { public void sharingOrderRedoSchedule() {
List<WxMall> malls = getMalls(); List<WxMall> malls = getMalls();


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java Просмотреть файл

@@ -35,8 +35,8 @@ public class SharingOrderResultSchedule {
} }
@Async @Async
// @Scheduled(cron = "0 0 3 * * ?") // 每天凌晨3:00更新分账结果
@Scheduled(cron = "0 30 */2 * * ?")// 每2个小时的30分钟
@Scheduled(cron = "0 15 3 * * ?") // 每天凌晨3:00更新分账结果
// @Scheduled(cron = "0 30 */2 * * ?")// 每2个小时的30分钟
// @Scheduled(cron = "* */15 * * * ?") // 测试10秒中一次 // @Scheduled(cron = "* */15 * * * ?") // 测试10秒中一次
public void sharingOrderResultSchedule() { public void sharingOrderResultSchedule() {
List<WxMall> malls = getMalls(); List<WxMall> malls = getMalls();


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/TtMerchantReciverSchedule.java Просмотреть файл

@@ -44,7 +44,7 @@ public class TtMerchantReciverSchedule {
* 每半小时 * 每半小时
*/ */
@Async @Async
@Scheduled(cron = "0 */30 * * * ?")
@Scheduled(cron = "0 33 */1 * * ?")
// @Scheduled(cron = "0 */5 * * * *?") //测试五分钟执行 // @Scheduled(cron = "0 */5 * * * *?") //测试五分钟执行
public void updateMerchantReciverSchedule() { public void updateMerchantReciverSchedule() {
List<WxAppinfo> ttAppInfos = getTTAppInfos(); List<WxAppinfo> ttAppInfos = getTTAppInfos();


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java Просмотреть файл

@@ -38,7 +38,7 @@ public class WxCUserTagsSchedule {
@Async @Async
// TODO 先不执行打标签操作了, 数据量太大,导致数据库CPU 100% // TODO 先不执行打标签操作了, 数据量太大,导致数据库CPU 100%
//@Scheduled(cron = "0 0 0 25 * ?") // 每月25日凌晨01:00对会员列表扫描补录标签 //@Scheduled(cron = "0 0 0 25 * ?") // 每月25日凌晨01:00对会员列表扫描补录标签
@Scheduled(cron = "0 0 2 * * ?") // 测试1分钟一次
// @Scheduled(cron = "0 0 2 * * ?") // 测试1分钟一次
public void wxCUserTagsSchedule() { public void wxCUserTagsSchedule() {
WxMall wxMall = new WxMall(); WxMall wxMall = new WxMall();


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/WxMsgModelSchedule.java Просмотреть файл

@@ -46,7 +46,7 @@ public class WxMsgModelSchedule {
WxMsgConfigMapper wxMsgConfigMapper; WxMsgConfigMapper wxMsgConfigMapper;


@Async @Async
@Scheduled(cron = "0 0 */1 * * ?") //
@Scheduled(cron = "0 25 */2 * * ?") //
public void querySmsTemplate() { public void querySmsTemplate() {
WxMsgModel msgModel = new WxMsgModel(); WxMsgModel msgModel = new WxMsgModel();
msgModel.setStatus(EnumMsgModelStatus.AUDITING.getCode()); msgModel.setStatus(EnumMsgModelStatus.AUDITING.getCode());
@@ -91,7 +91,7 @@ public class WxMsgModelSchedule {
} }


@Async @Async
@Scheduled(cron = "30 */10 * * * ?") //
@Scheduled(cron = "0 20 */2 * * ?") //
public void querySendDetails() { public void querySendDetails() {
WxMsgCallback msgCallback = new WxMsgCallback(); WxMsgCallback msgCallback = new WxMsgCallback();
msgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode()); msgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode());


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxQuestionOneselfServiceImpl.java Просмотреть файл

@@ -88,10 +88,10 @@ public class WxQuestionOneselfServiceImpl implements WxQuestionOneselfService {
record.setCreateDate(now); record.setCreateDate(now);
wxQuestionOneselfMapper.insert(record); wxQuestionOneselfMapper.insert(record);
} else { } else {
WxQuestionOneself byId = this.getById(record.getId());
if(!byId.getStatus().equals(EnumQuestionOneselfStatus.STATUS_THROW_IN.getCode())){
throw new MallinkException(ErrorCode.QUESTION_UPUP_LINE);
}
// WxQuestionOneself byId = this.getById(record.getId());
// if(!byId.getStatus().equals(EnumQuestionOneselfStatus.STATUS_THROW_IN.getCode())){
// throw new MallinkException(ErrorCode.QUESTION_UPUP_LINE);
// }


WxQuestionOneselfTopic wxQuestionOneselfTopic = new WxQuestionOneselfTopic(); WxQuestionOneselfTopic wxQuestionOneselfTopic = new WxQuestionOneselfTopic();
wxQuestionOneselfTopic.updateTenantInfo(record); wxQuestionOneselfTopic.updateTenantInfo(record);


+ 4
- 3
mallinkService/src/main/java/com/iformall/service/pay/service/share/wx/v3/WxPayShareV3Service.java Просмотреть файл

@@ -208,10 +208,11 @@ public class WxPayShareV3Service extends PayShareBaseAdapterService{
} }


String out_order_no = result.getString("out_order_no"); String out_order_no = result.getString("out_order_no");
if (StringUtils.isBlank(out_order_no) || !out_order_no.equals(record.getId().toString())){
throw new MallinkException(ErrorCode.PROFIT_SHARING_QUERY_RETURN_INVALID.getCode(),"out_order_no:["+out_order_no+"] WxProfitSharingOrder:["+record.getId()+"]");
if (StringUtils.isBlank(out_order_no) || !out_order_no.equals(record.getOrderId().toString())){
throw new MallinkException(ErrorCode.PROFIT_SHARING_QUERY_RETURN_INVALID.getCode(),"out_order_no:["+out_order_no+"] WxProfitSharingOrder:["+record.getOrderId()+"]");
} }
return new PayShareQueryResult(true, 200, "success",result, this.getReceivers(JSON.toJSONString(result.get("receivers"))));

return new PayShareQueryResult(true, EnumProfitSharingOrderStatus.PROFIT_SHARING_DONE.getCode(), "success",result, this.getReceivers(JSON.toJSONString(result.get("receivers"))));
} }


Загрузка…
Отмена
Сохранить