|
@@ -561,13 +561,19 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
if (Validator.isEmpty(orderGoods)) {
|
|
|
return "班级商品不存在";
|
|
|
}
|
|
|
+ Long bmrq = 0L;
|
|
|
+ if(userVo.getClassStartTime().longValue()<orderGoods.getCreateTime().longValue()){
|
|
|
+ bmrq = orderGoods.getCreateTime();
|
|
|
+ }else{
|
|
|
+ bmrq = userVo.getClassStartTime();
|
|
|
+ }
|
|
|
Map<String, String> params = new HashMap<>();
|
|
|
params.put("zh", OFFICIALPUSH_INFOACCOUNT);
|
|
|
params.put("bh", userVo.getOfficialName());
|
|
|
params.put("xm", userVo.getRealName());
|
|
|
params.put("sfz", userVo.getIdCard());
|
|
|
params.put("dh", userVo.getTelPhone());
|
|
|
- params.put("bmrq", DateUtils.timestampToDate(orderGoods.getCreateTime()));
|
|
|
+ params.put("bmrq", DateUtils.timestampToDate(bmrq));
|
|
|
String dataTxt = params.get("zh") + params.get("bh") + params.get("xm") + params.get("sfz") + params.get("dh") + params.get("bmrq");
|
|
|
String encrypted = dataSign(dataTxt, OFFICIALPUSH_TOKEN);
|
|
|
params.put("SignMsg", encrypted);
|