| @@ -23,6 +23,7 @@ import com.iformall.utils.Constant; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -442,4 +443,43 @@ public class WxMerchantController extends BaseController { | |||||
| return wxProfitSharingReceiverService.updateTtReceiverIsUse(merchant); | return wxProfitSharingReceiverService.updateTtReceiverIsUse(merchant); | ||||
| } | } | ||||
| @ApiOperation("更新收款账户信息:必填项 id(商户ID) name(商户名称) accountId(账号ID) accountTypeValue(账号类型) accountName(账号名称)") | |||||
| @PostMapping("/updateAccount") | |||||
| public ResultData updateAccount(@RequestBody WxMerchant wxMerchant) { | |||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::updateAccount"); | |||||
| if (wxMerchant.getId() == null) { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); | |||||
| } | |||||
| WxMerchant merchant = wxMerchantService.selectById(wxMerchant.getId()); | |||||
| if (merchant == null) { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "未找到门店"); | |||||
| } | |||||
| wxMerchant.setName(merchant.getName()); | |||||
| if (wxMerchant.getAccountTypeValue() == null) { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "账号类型不能为空"); | |||||
| } | |||||
| if (StringUtils.isEmpty(wxMerchant.getAccountId())) { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "账号ID不能为空"); | |||||
| } | |||||
| if (StringUtils.isEmpty(wxMerchant.getAccountName())) { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "账号名称不能为空"); | |||||
| } | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | |||||
| return wxMerchantService.updateMerchantAccount(wxMerchant,false); | |||||
| } | |||||
| @ApiOperation("删除分账账户") | |||||
| @GetMapping("/deleteByReceiverId") | |||||
| @ApiImplicitParam(name = "id", value = "商户分账账户ID", dataType = "Long", paramType = "query", required = true) | |||||
| public ResultData deleteByReceiverId(@ModelAttribute WxProfitSharingReceiver receiver) { | |||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::deleteByReceiverId"); | |||||
| if (receiver.getId() == null) { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空"); | |||||
| } | |||||
| receiver.updateTenantInfo(getTenantInfo()); | |||||
| return wxProfitSharingReceiverService.delReceiver(receiver, EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode(),false); | |||||
| } | |||||
| } | } | ||||
| @@ -0,0 +1,12 @@ | |||||
| INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (225, '停车商户管理', 202, 'Y', NULL, 1, NULL, NULL, 'parkMerchantList', NULL, 0, 222); | |||||
| INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (715, '停车支付订单', 610, 'Y', NULL, 1, NULL, NULL, 'parkPayList', NULL, 0, 715); | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 224, 225, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6611, 60701, 60702]' WHERE `id` = 1; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 7, 8, 9, 10, 50, 101, 102, 103, 104, 105, 106, 107, 201, 202, 203, 204, 205, 209, 211, 212, 221, 222, 224, 225, 251, 409, 410, 411, 416, 418, 420, 421, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 961, 6611, 60701, 60702]' WHERE `id` = 2; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 224, 225, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 60701, 60702]' WHERE `id` = 3; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 223, 224, 225, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 615, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5310, 5320, 6611, 60701, 60702, 61501, 61502]' WHERE `id` = 12; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 224, 225, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6611, 60701, 60702]' WHERE `id` = 1028; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 224, 225, 251, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6611, 60701, 60702]' WHERE `id` = 1035001036; | |||||
| UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 225, 223, 224, 251, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 615, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5310, 5320, 6611, 60701, 60702, 61501, 61502]' WHERE `id` = 103500103610; | |||||
| @@ -106,7 +106,7 @@ public class WxMerchantController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "账号名称不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "账号名称不能为空"); | ||||
| } | } | ||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | wxMerchant.updateTenantInfo(getTenantInfo()); | ||||
| return wxMerchantService.updateMerchantAccount(wxMerchant); | |||||
| return wxMerchantService.updateMerchantAccount(wxMerchant,true); | |||||
| } | } | ||||
| @ApiOperation("删除分账账户") | @ApiOperation("删除分账账户") | ||||
| @@ -121,7 +121,7 @@ public class WxMerchantController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户分账账户ID不能为空"); | ||||
| } | } | ||||
| receiver.updateTenantInfo(getTenantInfo()); | receiver.updateTenantInfo(getTenantInfo()); | ||||
| return wxProfitSharingReceiverService.delReceiver(receiver, EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode()); | |||||
| return wxProfitSharingReceiverService.delReceiver(receiver, EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode(),true); | |||||
| } | } | ||||
| @ApiOperation("查询是否有权限修改账户") | @ApiOperation("查询是否有权限修改账户") | ||||
| @@ -139,7 +139,13 @@ public interface WxMerchantService { | |||||
| ResultData updateMerchant(WxMerchant wxMerchant); | ResultData updateMerchant(WxMerchant wxMerchant); | ||||
| ResultData updateMerchantAccount(WxMerchant wxMerchant); | |||||
| /** | |||||
| * | |||||
| * @param wxMerchant | |||||
| * @param isSync 是否需要同步第三方(微信总分模式需要) | |||||
| * @return | |||||
| */ | |||||
| ResultData updateMerchantAccount(WxMerchant wxMerchant,boolean isSync); | |||||
| ResultData updateMerchantAdmin(WxMerchant wxMerchant); | ResultData updateMerchantAdmin(WxMerchant wxMerchant); | ||||
| @@ -46,11 +46,18 @@ public interface WxProfitSharingReceiverService { | |||||
| WxProfitSharingReceiver findReceiver(TenantEntity tenantEntity,Long merchantId, EnumAppPlat plat,EnumProfitSharingType sharingType); | WxProfitSharingReceiver findReceiver(TenantEntity tenantEntity,Long merchantId, EnumAppPlat plat,EnumProfitSharingType sharingType); | ||||
| List<WxProfitSharingReceiver> findReceivers(TenantEntity tenantEntity,Long merchantId); | List<WxProfitSharingReceiver> findReceivers(TenantEntity tenantEntity,Long merchantId); | ||||
| ResultData addReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver, List<WxProfitSharingReceiver> delList); | |||||
| ResultData addReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver, List<WxProfitSharingReceiver> delList, boolean isSync); | |||||
| ResultData delReceiver(WxProfitSharingReceiver receiver, Integer send); | |||||
| ResultData delReceiver(WxProfitSharingReceiver receiver, Integer send, boolean isSync); | |||||
| ResultData updateReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver); | |||||
| /** | |||||
| * | |||||
| * @param merchant | |||||
| * @param receiver | |||||
| * @param isSync 是否需要同步第三方(微信总分模式需要) | |||||
| * @return | |||||
| */ | |||||
| ResultData updateReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver, boolean isSync); | |||||
| void sendMsg(String phone, String account, String merchant, String time, Integer modelType, TenantEntity tenantEntity); | void sendMsg(String phone, String account, String merchant, String time, Integer modelType, TenantEntity tenantEntity); | ||||
| @@ -744,7 +744,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| @Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) | @Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) | ||||
| @Override | @Override | ||||
| public ResultData updateMerchantAccount(WxMerchant wxMerchant) { | |||||
| public ResultData updateMerchantAccount(WxMerchant wxMerchant,boolean isSync) { | |||||
| try { | try { | ||||
| if (wxMerchant.getId() == null) { | if (wxMerchant.getId() == null) { | ||||
| return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); | return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); | ||||
| @@ -760,7 +760,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| receiver.setReceiverType(wxMerchant.getAccountTypeValue()); | receiver.setReceiverType(wxMerchant.getAccountTypeValue()); | ||||
| receiver.setTrueName(wxMerchant.getAccountName()); | receiver.setTrueName(wxMerchant.getAccountName()); | ||||
| receiver.setParameter(wxMerchant.getAccountParameter()); | receiver.setParameter(wxMerchant.getAccountParameter()); | ||||
| return wxProfitSharingReceiverService.updateReceiver(wxMerchant, receiver); | |||||
| return wxProfitSharingReceiverService.updateReceiver(wxMerchant, receiver, isSync); | |||||
| } | } | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("db failed: 账户操作失败, e:" + e.getMessage(),e); | logger.error("db failed: 账户操作失败, e:" + e.getMessage(),e); | ||||
| @@ -156,7 +156,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv | |||||
| } | } | ||||
| @Override | @Override | ||||
| public ResultData addReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver, List<WxProfitSharingReceiver> delList) { | |||||
| public ResultData addReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver, List<WxProfitSharingReceiver> delList, boolean isSync) { | |||||
| WxAppinfo appInfo = wxAppinfoService.getCAppInfo(merchant,EnumAppPlat.WX); | WxAppinfo appInfo = wxAppinfoService.getCAppInfo(merchant,EnumAppPlat.WX); | ||||
| WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId()); | WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId()); | ||||
| @@ -177,18 +177,20 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv | |||||
| //receiver.setReceiverType(receiverParam.getReceiverType()); | //receiver.setReceiverType(receiverParam.getReceiverType()); | ||||
| //receiver.setTrueName(receiverParam.getTrueName()); | //receiver.setTrueName(receiverParam.getTrueName()); | ||||
| //添加分账账户 | |||||
| ShareAccountResult createResult = payServiceFactory.getPayShareAdapterService(EnumPayWay.PAY_WAY_WECHAT.getCode(),payAccount.getPayVersion()) | |||||
| .createShareAccount(appInfo, payAccount, receiver); | |||||
| if (!createResult.isSuccess()) { | |||||
| return new ResultData(createResult.getCode(), createResult.getMsg()); | |||||
| if(isSync){ | |||||
| //添加分账账户 | |||||
| ShareAccountResult createResult = payServiceFactory.getPayShareAdapterService(EnumPayWay.PAY_WAY_WECHAT.getCode(),payAccount.getPayVersion()) | |||||
| .createShareAccount(appInfo, payAccount, receiver); | |||||
| if (!createResult.isSuccess()) { | |||||
| return new ResultData(createResult.getCode(), createResult.getMsg()); | |||||
| } | |||||
| } | } | ||||
| wxProfitSharingReceiverMapper.insert(receiver); | wxProfitSharingReceiverMapper.insert(receiver); | ||||
| //添加成功才删除账户 | //添加成功才删除账户 | ||||
| for (WxProfitSharingReceiver delReceiver : delList) { | for (WxProfitSharingReceiver delReceiver : delList) { | ||||
| delReceiver(delReceiver, EnumMsgSend.MSG_SEND_NOT_IMMEDIATELY.getCode()); | |||||
| delReceiver(delReceiver, EnumMsgSend.MSG_SEND_NOT_IMMEDIATELY.getCode(),isSync); | |||||
| } | } | ||||
| WxProfitSharingReceiver wxProfitSharingReceiver = new WxProfitSharingReceiver(); | WxProfitSharingReceiver wxProfitSharingReceiver = new WxProfitSharingReceiver(); | ||||
| @@ -204,7 +206,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv | |||||
| //添加变更短信 | //添加变更短信 | ||||
| sendMsgByType(EnumMsgModel.UPDATE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), merchant.getId(), receiver.getReceiverAccount(), receiver); | sendMsgByType(EnumMsgModel.UPDATE_SHARING_ACCOUNT_NOTIFY_MERCHANT.getCode(), merchant.getId(), receiver.getReceiverAccount(), receiver); | ||||
| } | } | ||||
| return new ResultData(createResult.getData()); | |||||
| return new ResultData(); | |||||
| } | } | ||||
| private void sendMsgByType(Integer type, Long merchantId, String account, TenantEntity tenantEntity) { | private void sendMsgByType(Integer type, Long merchantId, String account, TenantEntity tenantEntity) { | ||||
| @@ -408,10 +410,10 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv | |||||
| } | } | ||||
| @Override | @Override | ||||
| public ResultData delReceiver(WxProfitSharingReceiver receiver, Integer send) { | |||||
| public ResultData delReceiver(WxProfitSharingReceiver receiver, Integer send, boolean isSync) { | |||||
| WxAppinfo appInfo = wxAppinfoService.getCAppInfo(receiver,EnumAppPlat.WX); | |||||
| WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId()); | |||||
| // WxAppinfo appInfo = wxAppinfoService.getCAppInfo(receiver,EnumAppPlat.WX); | |||||
| // WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId()); | |||||
| receiver = wxProfitSharingReceiverMapper.selectById(receiver.getId()); | receiver = wxProfitSharingReceiverMapper.selectById(receiver.getId()); | ||||
| @@ -432,10 +434,14 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv | |||||
| ))) { | ))) { | ||||
| //还有别的商户使用这个账号,不从微信服务器申请删除 | //还有别的商户使用这个账号,不从微信服务器申请删除 | ||||
| } else { | } else { | ||||
| ShareAccountResult shareResult = payServiceFactory.getPayShareAdapterService(receiver.getPlat(),payAccount.getPayVersion()).deleteShareAccount(appInfo, payAccount, receiver); | |||||
| if (!shareResult.isSuccess()) { | |||||
| return new ResultData(shareResult.getCode(), shareResult.getMsg()); | |||||
| } | |||||
| if(isSync){ | |||||
| WxAppinfo appInfo = wxAppinfoService.getCAppInfo(receiver,EnumAppPlat.WX); | |||||
| WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId()); | |||||
| ShareAccountResult shareResult = payServiceFactory.getPayShareAdapterService(receiver.getPlat(),payAccount.getPayVersion()).deleteShareAccount(appInfo, payAccount, receiver); | |||||
| if (!shareResult.isSuccess()) { | |||||
| return new ResultData(shareResult.getCode(), shareResult.getMsg()); | |||||
| } | |||||
| } | |||||
| } | } | ||||
| receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); | receiver.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_INVALID.getCode()); | ||||
| @@ -451,7 +457,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv | |||||
| } | } | ||||
| @Override | @Override | ||||
| public ResultData updateReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver) { | |||||
| public ResultData updateReceiver(WxMerchant merchant, WxProfitSharingReceiver receiver,boolean isSync) { | |||||
| WxProfitSharingReceiver oldReceiver = new WxProfitSharingReceiver(); | WxProfitSharingReceiver oldReceiver = new WxProfitSharingReceiver(); | ||||
| oldReceiver.updateTenantInfo(merchant); | oldReceiver.updateTenantInfo(merchant); | ||||
| @@ -466,7 +472,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv | |||||
| oldReceiver = wxProfitSharingReceiverMapper.selectOne(new QueryWrapper(oldReceiver)); | oldReceiver = wxProfitSharingReceiverMapper.selectOne(new QueryWrapper(oldReceiver)); | ||||
| if (oldReceiver == null) { | if (oldReceiver == null) { | ||||
| return addReceiver(merchant, receiver, delList); | |||||
| return addReceiver(merchant, receiver, delList, isSync); | |||||
| } else { | } else { | ||||
| oldReceiver.setParameter(receiver.getParameter()); | oldReceiver.setParameter(receiver.getParameter()); | ||||
| oldReceiver.setUpdateTime(new Date()); | oldReceiver.setUpdateTime(new Date()); | ||||
| @@ -112,11 +112,15 @@ public class AppUtils { | |||||
| } | } | ||||
| public static void main(String[] args) { | public static void main(String[] args) { | ||||
| for (int i=0;i<=20;i++){ | |||||
| String appId = getAppId(); | |||||
| System.out.println(appId.toUpperCase()); | |||||
| } | |||||
| String appId = getAppId(); | String appId = getAppId(); | ||||
| String appKey = getAppKey(appId); | |||||
| String signKey = getSignKey(appId,appKey); | |||||
| System.out.println("appId: "+appId); | |||||
| System.out.println("appKey: "+appKey); | |||||
| System.out.println("signKey: "+signKey); | |||||
| // String appKey = getAppKey(appId); | |||||
| // String signKey = getSignKey(appId,appKey); | |||||
| System.out.println(appId.toUpperCase()); | |||||
| // System.out.println("appKey: "+appKey); | |||||
| // System.out.println("signKey: "+signKey); | |||||
| } | } | ||||
| } | } | ||||