yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
曹磊 2024-07-16 19:49:17 +08:00
parent c6d740cc26 afa9424f2e
commit 2a12a7f2fa
3 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

@ -2624,27 +2624,27 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
if (orders.getPayWay() == 1 || orders.getPayWay() == 2 || orders.getPayWay() == 3 || orders.getPayWay() == 4) {
if(userMoney.compareTo(BigDecimal.ZERO) > 0){
boolean refund = wxService.refund(orders.getOrdersNo(), orders.getPayMoney(), userMoney, orders.getPayWay());
if (!refund) {
return Result.error("退款失败，请联系客服！");
}
// boolean refund = wxService.refund(orders.getOrdersNo(), orders.getPayMoney(), userMoney, orders.getPayWay());
// if (!refund) {
// return Result.error("退款失败，请联系客服！");
// }
}
userMoneyDetails.setManipulateType(1);
userMoneyDetails.setBlFlag(2);
} else if (orders.getPayWay() == 6) {
if(userMoney.compareTo(BigDecimal.ZERO) > 0) {
String data = aliPayController.alipayRefund(orders.getOrdersNo(), userMoney);
if (StringUtils.isNotBlank(data)) {
log.error(data);
JSONObject jsonObject = JSON.parseObject(data);
JSONObject alipay_trade_refund_response = jsonObject.getJSONObject("alipay_trade_refund_response");
String code1 = alipay_trade_refund_response.getString("code");
if (!"10000".equals(code1)) {
return Result.error("退款失败！" + alipay_trade_refund_response.getString("sub_msg"));
}
} else {
return Result.error("退款失败！");
}
// String data = aliPayController.alipayRefund(orders.getOrdersNo(), userMoney);
// if (StringUtils.isNotBlank(data)) {
// log.error(data);
// JSONObject jsonObject = JSON.parseObject(data);
// JSONObject alipay_trade_refund_response = jsonObject.getJSONObject("alipay_trade_refund_response");
// String code1 = alipay_trade_refund_response.getString("code");
// if (!"10000".equals(code1)) {
// return Result.error("退款失败！" + alipay_trade_refund_response.getString("sub_msg"));
// }
// } else {
// return Result.error("退款失败！");
// }
}
userMoneyDetails.setManipulateType(1);
userMoneyDetails.setBlFlag(2);

12
src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java
View File

@ -82,20 +82,14 @@ public class AllTaskServiceImpl implements AllTaskSercice {
calendar2.add(Calendar.MONTH, -1); // 获取上个月
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
String lastMonth = format.format(calendar2.getTime());
startTime = lastMonth+"-21 00:00:00";
startTime = lastMonth+"-16 00:00:00";
endTime = lastMonth+"-"+lastDayOfMonth+" 23:59:59";
}else if(dayOfMonth == 11){
}else if(dayOfMonth == 16){
Calendar calendar4 = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
String lastMonth = format.format(calendar4.getTime());
startTime = lastMonth+"-01 00:00:00";
endTime = lastMonth+"-10 23:59:59";
}else if(dayOfMonth == 21){
Calendar calendar4 = Calendar.getInstance();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
String lastMonth = format.format(calendar4.getTime());
startTime = lastMonth+"-11 00:00:00";
endTime = lastMonth+"-20 23:59:59";
endTime = lastMonth+"-15 23:59:59";
}
System.out.println("startTime：" + startTime);
System.out.println("endTime：" + endTime);

36
src/main/java/com/sqx/modules/utils/PeriodUtil.java
View File

@ -13,41 +13,41 @@ public class PeriodUtil {
final Calendar c = Calendar.getInstance();
c.setTime(date);
//如果日期为1号到10号 返回当月1日与10日
if(c.get(Calendar.DAY_OF_MONTH) >=1 && c.get(Calendar.DAY_OF_MONTH)<=10){
if(c.get(Calendar.DAY_OF_MONTH) >=1 && c.get(Calendar.DAY_OF_MONTH)<=15){
c.set(Calendar.DATE,1);
c.set(Calendar.HOUR_OF_DAY, 0);
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
period.setStartFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
c.set(Calendar.DATE,10);
c.set(Calendar.DATE,15);
c.set(Calendar.HOUR_OF_DAY, 23);
c.set(Calendar.MINUTE, 59);
c.set(Calendar.SECOND, 59);
c.set(Calendar.MILLISECOND, 999);
period.setEndFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
} else if (c.get(Calendar.DAY_OF_MONTH)>=11 && c.get(Calendar.DAY_OF_MONTH)<=20) {
} else if (c.get(Calendar.DAY_OF_MONTH)>=16 && c.get(Calendar.DAY_OF_MONTH)<=31) {
//如果日期为11号到20号 返回当月11日与20日
c.set(Calendar.DATE,11);
c.set(Calendar.HOUR_OF_DAY, 0);
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
period.setStartFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
c.set(Calendar.DATE,20);
c.set(Calendar.HOUR_OF_DAY, 23);
c.set(Calendar.MINUTE, 59);
c.set(Calendar.SECOND, 59);
c.set(Calendar.MILLISECOND, 999);
period.setEndFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
}else if (c.get(Calendar.DAY_OF_MONTH)>=21 && c.get(Calendar.DAY_OF_MONTH)<=31) {
//如果日期为21号到31号 返回当月21日与当月最后一天
c.set(Calendar.DATE,21);
c.set(Calendar.DATE,16);
c.set(Calendar.HOUR_OF_DAY, 0);
c.set(Calendar.MINUTE, 0);
c.set(Calendar.SECOND, 0);
c.set(Calendar.MILLISECOND, 0);
period.setStartFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
// c.set(Calendar.DATE,20);
// c.set(Calendar.HOUR_OF_DAY, 23);
// c.set(Calendar.MINUTE, 59);
// c.set(Calendar.SECOND, 59);
// c.set(Calendar.MILLISECOND, 999);
// period.setEndFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
// }else if (c.get(Calendar.DAY_OF_MONTH)>=21 && c.get(Calendar.DAY_OF_MONTH)<=31) {
// //如果日期为21号到31号 返回当月21日与当月最后一天
// c.set(Calendar.DATE,21);
// c.set(Calendar.HOUR_OF_DAY, 0);
// c.set(Calendar.MINUTE, 0);
// c.set(Calendar.SECOND, 0);
// c.set(Calendar.MILLISECOND, 0);
// period.setStartFundData(DateUtil.parse(DateUtil.format(c.getTime(),"yyyy-MM-dd HH:mm:ss")));
//获取月底的最后一天
c.set(Calendar.DATE,DateUtil.endOfMonth(c).get(Calendar.DATE));
c.set(Calendar.HOUR_OF_DAY, 23);