修改区域公司

dev-discount
袁野 2 years ago
parent 2d8fdf4ee2
commit 523fbe114e
  1. 6
      hai-bweb/src/main/java/com/bweb/controller/HighDiscountPackageController.java
  2. 2
      hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java
  3. 1
      hai-service/src/main/java/com/hai/config/UnionUserConfig.java
  4. 4
      hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@ -164,9 +164,9 @@ public class HighDiscountPackageController {
if (StringUtils.isBlank(highDiscountPackage.getTitle()) if (StringUtils.isBlank(highDiscountPackage.getTitle())
|| highDiscountPackage.getSalesType() == null || highDiscountPackage.getSalesType() == null
// || StringUtils.isBlank(highDiscountPackage.getBannerImg()) || StringUtils.isBlank(highDiscountPackage.getBannerImg())
// || StringUtils.isBlank(highDiscountPackage.getListImg()) || StringUtils.isBlank(highDiscountPackage.getListImg())
// || StringUtils.isBlank(highDiscountPackage.getDetailsImg()) || StringUtils.isBlank(highDiscountPackage.getDetailsImg())
) { ) {
log.error("HighAgentController -> insertCouponPackageInfo() error!","参数错误"); log.error("HighAgentController -> insertCouponPackageInfo() error!","参数错误");
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");

@ -308,8 +308,6 @@ public class HighThirdPartyController {
SessionObject sessionObject = userCenter.getSessionObject(request); SessionObject sessionObject = userCenter.getSessionObject(request);
HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject();
System.out.println("======================================================" + object);
if (StringUtils.isBlank(object.getString("customerMobile")) || if (StringUtils.isBlank(object.getString("customerMobile")) ||
StringUtils.isBlank(object.getString("regionId")) || StringUtils.isBlank(object.getString("regionId")) ||
object.getInteger("productType") == null || object.getInteger("productType") == null ||

@ -50,6 +50,7 @@ public class UnionUserConfig {
paramMap.remove("secret"); paramMap.remove("secret");
JSONObject jsonObject = JSONObject.parseObject(UnionUtils.sendPostGson(requestUrl+"backendToken", paramMap)); JSONObject jsonObject = JSONObject.parseObject(UnionUtils.sendPostGson(requestUrl+"backendToken", paramMap));
String backendToken = jsonObject.getJSONObject("params").getString("backendToken"); String backendToken = jsonObject.getJSONObject("params").getString("backendToken");
System.out.println(jsonObject + "=================================================");
redisUtil.set("UNION_BACKEND_TOKEN", backendToken,jsonObject.getJSONObject("params").getLong("expiresIn")); redisUtil.set("UNION_BACKEND_TOKEN", backendToken,jsonObject.getJSONObject("params").getLong("expiresIn"));
return backendToken; return backendToken;
} }

@ -2262,8 +2262,6 @@ public class HighOrderServiceImpl implements HighOrderService {
// 1 星巴克 2 肯德基 3 会员充值 // 1 星巴克 2 肯德基 3 会员充值
if (object.getInteger("productType") == 1) { if (object.getInteger("productType") == 1) {
List<String> List = new ArrayList<>(); List<String> List = new ArrayList<>();
JSONArray array = object.getJSONArray("orderItems"); JSONArray array = object.getJSONArray("orderItems");
@ -2292,7 +2290,7 @@ public class HighOrderServiceImpl implements HighOrderService {
if (!object1.getString("milkBubble").equals("")) { if (!object1.getString("milkBubble").equals("")) {
contentMap.put("milkBubble", object1.getString("milkBubble")); contentMap.put("milkBubble", object1.getString("milkBubble"));
} }
if (!object1.getString("num").equals("")) { if (!"".equals(object1.getString("num"))) {
contentMap.put("num", object1.getString("num")); contentMap.put("num", object1.getString("num"));
} }
List.add(JSON.toJSONString(contentMap)); List.add(JSON.toJSONString(contentMap));

Loading…
Cancel
Save