diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index bfd1c2cb7..8e13ceee7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.config.WechatWebProperties; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; @@ -92,26 +93,29 @@ public class WxProjectConfigController extends BaseController { @Autowired MallUserInfoService mallUserInfoService; + @Autowired + private WechatWebProperties wechatWebProperties; + @Autowired @Qualifier("openRedisTemplate") RedisTemplate openRedisTemplate; - @ApiOperation("添加商场基础数据") - @GetMapping(value = "/init/{id}") - @SystemControllerLog(description = "商场基础数据") - @TenantIgnore - public ResultData init(@PathVariable Long id) { - logger.debug("[" + getIpAddr() + "] WxProjectConfigController::init"); - try { - wxProjectConfigService.initProjectConfig(id); - return new ResultData(); - }catch (Exception e){ - logger.error(e.getMessage(),e); - return new ResultData(ErrorCode.SYS_SERVER_ERROR); - } - - } +// @ApiOperation("添加商场基础数据") +// @GetMapping(value = "/init/{id}") +// @SystemControllerLog(description = "商场基础数据") +// @TenantIgnore +// public ResultData init(@PathVariable Long id) { +// logger.debug("[" + getIpAddr() + "] WxProjectConfigController::init"); +// try { +// wxProjectConfigService.initProjectConfig(id); +// return new ResultData(); +// }catch (Exception e){ +// logger.error(e.getMessage(),e); +// return new ResultData(ErrorCode.SYS_SERVER_ERROR); +// } +// +// } @ApiOperation("查询商场集团列表") @@ -241,7 +245,7 @@ public class WxProjectConfigController extends BaseController { } if(StringUtils.isBlank(wxPayAccount.getNotifyUrl())){ - wxPayAccount.setNotifyUrl("https://admin.malls.iformall.com/wxPay/notify"); + wxPayAccount.setNotifyUrl(wechatWebProperties.getUrl()+"/wxPay/notify"); } if(StringUtils.isBlank(wxPayAccount.getCertPath())){ wxPayAccount.setCertPath("/opt/iformall/service/apiclient_cert.p12"); @@ -374,6 +378,8 @@ public class WxProjectConfigController extends BaseController { if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() > 0) { PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(userInfo); + }else{ + userInfo.setPassword(null); } userInfo.setIsAdmin(EnumUserAdmin.ADMIN.getCode()); userInfoService.saveOrUpdate(userInfo); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java index b21177e2e..2fbcebcae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java @@ -23,19 +23,19 @@ public class WxPayAccountServiceImpl implements WxPayAccountService { @Override public WxPayAccount wxPayAccountInit(String tenantId, WxProjectConfig wxProjectConfig) { WxPayAccount wxPayAccount = new WxPayAccount(); - wxPayAccount.setTenantId(tenantId); - wxPayAccount.setMchId(wxProjectConfig.getMchId()); - wxPayAccount.setSubMchId(wxProjectConfig.getSubMchId()); - wxPayAccount.setApiKey(wxProjectConfig.getApiKey()); - //默认------------------------------------------------------------- - wxPayAccount.setNotifyUrl("https://admin.malls.iformall.com/wxPay/notify"); - wxPayAccount.setCertPath("/opt/iformall/service/apiclient_cert.p12"); - //---------------------------------------------------------------- - wxPayAccount.setType(1);//0:普通商户模式, 1:服务商模式(默认服务商模式) - wxPayAccount.setShare(0);//0: 未分账,1:分账(默认不分账) - wxPayAccount.setRate(wxProjectConfig.getRate()); - wxPayAccount.setRealRate(wxProjectConfig.getRealRate()); - wxPayAccountMapper.insert(wxPayAccount); +// wxPayAccount.setTenantId(tenantId); +// wxPayAccount.setMchId(wxProjectConfig.getMchId()); +// wxPayAccount.setSubMchId(wxProjectConfig.getSubMchId()); +// wxPayAccount.setApiKey(wxProjectConfig.getApiKey()); +// //默认------------------------------------------------------------- +// wxPayAccount.setNotifyUrl("https://admin.malls.iformall.com/wxPay/notify"); +// wxPayAccount.setCertPath("/opt/iformall/service/apiclient_cert.p12"); +// //---------------------------------------------------------------- +// wxPayAccount.setType(1);//0:普通商户模式, 1:服务商模式(默认服务商模式) +// wxPayAccount.setShare(0);//0: 未分账,1:分账(默认不分账) +// wxPayAccount.setRate(wxProjectConfig.getRate()); +// wxPayAccount.setRealRate(wxProjectConfig.getRealRate()); +// wxPayAccountMapper.insert(wxPayAccount); return wxPayAccount; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index 1c29ba4f5..168c3d4a4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -71,62 +71,62 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { @Override @Transactional public void initProjectConfig(Long id) { - WxProjectConfig wxProjectConfig = wxProjectConfigMapper.selectById(id); - if(wxProjectConfig!=null && wxProjectConfig.getDelType()<10000){ - // 1. wx_mall 商场 - String tenantId = wxMallService.wxMallInit(wxProjectConfig); - // 2. wx_coupon_send_config - wxCouponSendConfigService.wxCouponSendConfigInit(tenantId); - // 3. wx_mall_building 商场楼座 - wxMallBuildingService.wxMallBuildingInit(tenantId,wxProjectConfig.getMallBuilding()); - //# --- 特殊商户号开通后,填写此数据 - //# 5. wx_pay_account - WxPayAccount wxPayAccount = wxPayAccountService.wxPayAccountInit(tenantId,wxProjectConfig); - //# --- 特殊商户号开通后,填写此数据 - //# 6. wx_pay_account_bill - Long payBillId = wxPayAccountBillService.wxPayAccountInit(wxPayAccount); - //# --- 小程序开通后,填写此数据,并设置域名及业务域名等 - //# 7. wx_appinfo - wxAppinfoService.wxAppinfoInit(tenantId,wxPayAccount.getId(),payBillId,wxProjectConfig); - - wxAuthorizerInfoService.wxAuthorizerInfoInit(tenantId,wxProjectConfig); - - wxAuthorizerInfoService.wxWeappExtSetInit(wxProjectConfig); - // 9. mall_user_info - // 10. mall_role - // 11. mall_role_permission - //# 12. mall_user_role - Long mallUserInfoId = mallUserInfoService.MallUserInfoInit(tenantId, wxProjectConfig); - //# 13. wx_msg_config - wxMsgConfigService.WxMsgConfigInit(tenantId, wxProjectConfig); - //# ETCP 设置完后再填写此数据 - //# 14. wx_park - wxParkService.wxParkInit(tenantId, wxProjectConfig); - //# 积分成长值设置wx_score_rules - wxScoreRulesService.wxScoreRulesInit(tenantId); - //# 17. wx_template_msg - //# 设置核销成功通知,核销失败通知 - wxTemplateMsgService.wxTemplateMsgInit(tenantId); - //# 18. wx_wiwide_info -- 迈外迪 服务商后台设置商户(点击获取商户bid),再找迈外迪初始化,收到激活邮件激活后,再在数据库中插入此数据 - //# 数据格式如下 - //# szld1086@iformall - //# 1391054397 - //# wuguoqiang@iformall.com - - // # 19. wx_question - wxQuestionService.wxQuestionInit(tenantId); - - //# 20. wx_msg_validationcode_model, 数据重新一下 - wxMsgValidationcodeModelService.wxMsgValidationcodeModelInit(tenantId, wxProjectConfig.getName(), wxProjectConfig.getImgUrlH()); - //wx_flow_config - wxFlowService.wxFlowConfigInit(tenantId); - //初始化成功 删除标记 - wxProjectConfig.setDelType(10000); - wxProjectConfigMapper.updateById(wxProjectConfig); - - }else { - logger.info("------数据已初始化"); - } +// WxProjectConfig wxProjectConfig = wxProjectConfigMapper.selectById(id); +// if(wxProjectConfig!=null && wxProjectConfig.getDelType()<10000){ +// // 1. wx_mall 商场 +// String tenantId = wxMallService.wxMallInit(wxProjectConfig); +// // 2. wx_coupon_send_config +// wxCouponSendConfigService.wxCouponSendConfigInit(tenantId); +// // 3. wx_mall_building 商场楼座 +// wxMallBuildingService.wxMallBuildingInit(tenantId,wxProjectConfig.getMallBuilding()); +// //# --- 特殊商户号开通后,填写此数据 +// //# 5. wx_pay_account +// WxPayAccount wxPayAccount = wxPayAccountService.wxPayAccountInit(tenantId,wxProjectConfig); +// //# --- 特殊商户号开通后,填写此数据 +// //# 6. wx_pay_account_bill +// Long payBillId = wxPayAccountBillService.wxPayAccountInit(wxPayAccount); +// //# --- 小程序开通后,填写此数据,并设置域名及业务域名等 +// //# 7. wx_appinfo +// wxAppinfoService.wxAppinfoInit(tenantId,wxPayAccount.getId(),payBillId,wxProjectConfig); +// +// wxAuthorizerInfoService.wxAuthorizerInfoInit(tenantId,wxProjectConfig); +// +// wxAuthorizerInfoService.wxWeappExtSetInit(wxProjectConfig); +// // 9. mall_user_info +// // 10. mall_role +// // 11. mall_role_permission +// //# 12. mall_user_role +// Long mallUserInfoId = mallUserInfoService.MallUserInfoInit(tenantId, wxProjectConfig); +// //# 13. wx_msg_config +// wxMsgConfigService.WxMsgConfigInit(tenantId, wxProjectConfig); +// //# ETCP 设置完后再填写此数据 +// //# 14. wx_park +// wxParkService.wxParkInit(tenantId, wxProjectConfig); +// //# 积分成长值设置wx_score_rules +// wxScoreRulesService.wxScoreRulesInit(tenantId); +// //# 17. wx_template_msg +// //# 设置核销成功通知,核销失败通知 +// wxTemplateMsgService.wxTemplateMsgInit(tenantId); +// //# 18. wx_wiwide_info -- 迈外迪 服务商后台设置商户(点击获取商户bid),再找迈外迪初始化,收到激活邮件激活后,再在数据库中插入此数据 +// //# 数据格式如下 +// //# szld1086@iformall +// //# 1391054397 +// //# wuguoqiang@iformall.com +// +// // # 19. wx_question +// wxQuestionService.wxQuestionInit(tenantId); +// +// //# 20. wx_msg_validationcode_model, 数据重新一下 +// wxMsgValidationcodeModelService.wxMsgValidationcodeModelInit(tenantId, wxProjectConfig.getName(), wxProjectConfig.getImgUrlH()); +// //wx_flow_config +// wxFlowService.wxFlowConfigInit(tenantId); +// //初始化成功 删除标记 +// wxProjectConfig.setDelType(10000); +// wxProjectConfigMapper.updateById(wxProjectConfig); +// +// }else { +// logger.info("------数据已初始化"); +// } } @@ -197,7 +197,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { wxPayAccountBill.setMchId(wxPayAccount.getMchId()); wxPayAccountBill.setSubMchId(wxPayAccount.getSubMchId()); wxPayAccountBill.setApiKey(wxPayAccount.getApiKey()); - wxPayAccountBill.setNotifyUrl(wxPayAccount.getNotifyUrl()); + wxPayAccountBill.setNotifyUrl(wxPayAccount.getNotifyUrl().replaceAll("/wxPay/","/wxPayBill/")); wxPayAccountBill.setCertPath(wxPayAccount.getCertPath()); wxPayAccountBill.setType(wxPayAccount.getType()); wxPayAccountBill.setShare(!(wxPayAccount.getShare() == 0)); @@ -216,6 +216,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { } } + @Override @Transactional public void initUserInfo(MallUserInfo userInfo) {