| @@ -63,7 +63,7 @@ public class PosOrderController extends BaseController { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), errMessage); | |||
| } | |||
| posOrder.setTenantId(user.getTenantId()); | |||
| posOrder.updateTenantInfo(user); | |||
| posOrder.setBuUserId(user.getId()); | |||
| posOrderService.saveOrUpdate(posOrder); | |||
| return new ResultData(posOrder); | |||
| @@ -14,6 +14,7 @@ import com.amazonaws.services.s3.model.PutObjectRequest; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.config.AwsProperty; | |||
| import com.iformall.domain.po.MallResource; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.service.MallResourceService; | |||
| import com.iformall.utils.ImgUtil; | |||
| import io.swagger.annotations.Api; | |||
| @@ -51,7 +52,12 @@ public class UploadController extends BaseController { | |||
| private AmazonS3 s3 = null; | |||
| private ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, String tenantId) { | |||
| private String getFileName(TenantEntity tenantEntity, String fileName) { | |||
| fileName = tenantEntity.getTenantId() + "/" + fileName; | |||
| return fileName; | |||
| } | |||
| private ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantEntity) { | |||
| ResultData data = new ResultData(); | |||
| try { | |||
| if (s3 == null) { | |||
| @@ -78,7 +84,7 @@ public class UploadController extends BaseController { | |||
| logger.info(url.toString()); | |||
| MallResource mr = new MallResource(); | |||
| mr.setTenantId(tenantId); | |||
| mr.updateTenantInfo(tenantEntity); | |||
| mr.setBucket(awsProperty.getBucketName()); | |||
| mr.setS3Key(fileName); | |||
| mr.setUrl(url.toString()); | |||
| @@ -128,6 +134,8 @@ public class UploadController extends BaseController { | |||
| public ResultData awsfileUpload(@RequestParam("file") MultipartFile multiReq) throws Exception { | |||
| logger.info("[" + getIpAddr() + "] UploadController::awsfileUpload"); | |||
| TenantEntity tenantEntity = getTenantInfo(); | |||
| ObjectMetadata metadata = new ObjectMetadata(); | |||
| metadata.setContentType(multiReq.getContentType()); | |||
| metadata.setContentLength(multiReq.getSize()); | |||
| @@ -138,17 +146,16 @@ public class UploadController extends BaseController { | |||
| String fileName = UUID.randomUUID().toString(); | |||
| int dot = multiReq.getOriginalFilename().lastIndexOf('.'); | |||
| if (dot >= 0) { | |||
| fileName = getTenantId() + "/" + fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); | |||
| String fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); | |||
| fileName = getFileName(tenantEntity, fileName + fileFormat); | |||
| } else { | |||
| fileName = getTenantId() + "/" + fileName; | |||
| fileName = getFileName(tenantEntity, fileName); | |||
| } | |||
| ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, getTenantId()); | |||
| ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); | |||
| return data; | |||
| } | |||
| /** | |||
| * 图片上传 | |||
| * | |||
| @@ -161,6 +168,8 @@ public class UploadController extends BaseController { | |||
| public ResultData awsImgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception { | |||
| logger.info("[" + getIpAddr() + "] UploadController::awsImgUpload"); | |||
| TenantEntity tenantEntity = getTenantInfo(); | |||
| String fileName = UUID.randomUUID().toString(); | |||
| String tempFileName = fileName; | |||
| String fileFormat = ""; | |||
| @@ -168,9 +177,9 @@ public class UploadController extends BaseController { | |||
| int dot = multiReq.getOriginalFilename().lastIndexOf('.'); | |||
| if (dot >= 0) { | |||
| fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); | |||
| fileName = getTenantId() + "/" + fileName + fileFormat; | |||
| fileName = getFileName(tenantEntity, fileName + fileFormat); | |||
| } else { | |||
| fileName = getTenantId() + "/" + fileName; | |||
| fileName = getFileName(tenantEntity, fileName); | |||
| } | |||
| System.out.println(fileName); | |||
| @@ -199,7 +208,7 @@ public class UploadController extends BaseController { | |||
| ObjectMetadata metadata = new ObjectMetadata(); | |||
| metadata.setContentType(multiReq.getContentType()); | |||
| metadata.setContentLength(newFile.length()); | |||
| ResultData data = awsUpload(new FileInputStream(newFile), metadata, fileName, getTenantId()); | |||
| ResultData data = awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); | |||
| // 删除本地缓存 | |||
| newFile.delete(); | |||
| return data; | |||
| @@ -207,7 +216,7 @@ public class UploadController extends BaseController { | |||
| ObjectMetadata metadata = new ObjectMetadata(); | |||
| metadata.setContentType(multiReq.getContentType()); | |||
| metadata.setContentLength(multiReq.getSize()); | |||
| ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, getTenantId()); | |||
| ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); | |||
| return data; | |||
| } | |||
| } | |||
| @@ -224,6 +233,8 @@ public class UploadController extends BaseController { | |||
| public ResultData awsFilesUpload(@RequestParam("files") MultipartFile[] files) throws Exception { | |||
| logger.info("[" + getIpAddr() + "] UploadController::awsFilesUpload"); | |||
| TenantEntity tenantEntity = getTenantInfo(); | |||
| if (files.length > 0) { | |||
| ResultData data = new ResultData(); | |||
| List<Map<String, String>> dataList = new ArrayList<Map<String, String>>(); | |||
| @@ -242,12 +253,13 @@ public class UploadController extends BaseController { | |||
| String fileName = UUID.randomUUID().toString(); | |||
| int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); | |||
| if (dot >= 0) { | |||
| fileName = getTenantId() + "/" + fileName + multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); | |||
| String fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); | |||
| getFileName(tenantEntity, fileName + fileFormat); | |||
| } else { | |||
| fileName = getTenantId() + "/" + fileName; | |||
| getFileName(tenantEntity, fileName); | |||
| } | |||
| ResultData data1 = awsUpload(multipartFile.getInputStream(), metadata, fileName, getTenantId()); | |||
| ResultData data1 = awsUpload(multipartFile.getInputStream(), metadata, fileName, tenantEntity); | |||
| if (data1.code == ResultData.SUCCESS) { | |||
| Map _data = (Map) data1.data; | |||
| map.put("url", (String) _data.get("url")); | |||
| @@ -126,7 +126,7 @@ public class WxCUserController extends BaseController { | |||
| wxCUserFromB.setCUserId(wxCUserBasicInfo.getId()); | |||
| wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); | |||
| wxCUserFromB.setMerchantId(bUser.getMerchantId()); | |||
| wxCUserFromB.setTenantId(bUser.getTenantId()); | |||
| wxCUserFromB.updateTenantInfo(bUser); | |||
| wxCUserFromB.setAppId(wxCUserFromBDto.getAppId()); | |||
| wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); | |||
| wxCUserFromBService.saveOrUpdate(wxCUserFromB); | |||
| @@ -156,7 +156,7 @@ public class WxCUserController extends BaseController { | |||
| wxCUserFromB.setCUserId(cUserId); | |||
| wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); | |||
| wxCUserFromB.setMerchantId(bUser.getMerchantId()); | |||
| wxCUserFromB.setTenantId(bUser.getTenantId()); | |||
| wxCUserFromB.updateTenantInfo(bUser); | |||
| wxCUserFromB.setAppId(wxCUserFromBDto.getAppId()); | |||
| wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); | |||
| wxCUserFromBService.saveOrUpdate(wxCUserFromB); | |||
| @@ -48,7 +48,7 @@ public class WxCardPayController extends BaseController { | |||
| logger.info("cardSpendlist: " + ipStr + " :" + wxCardSpendVo.toString()); | |||
| if (wxCardSpendVo == null) wxCardSpendVo = new WxCardSpendVo(); | |||
| WxMerchantBUser user = getUser(); | |||
| wxCardSpendVo.setTenantId(user.getTenantId()); | |||
| wxCardSpendVo.updateTenantInfo(user); | |||
| wxCardSpendVo.setMerchantId(user.getMerchantId()); | |||
| final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| @@ -61,7 +61,7 @@ public class WxCardPayController extends BaseController { | |||
| logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); | |||
| if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | |||
| WxMerchantBUser user = getUser(); | |||
| wxCardSpend.setTenantId(user.getTenantId()); | |||
| wxCardSpend.updateTenantInfo(user); | |||
| wxCardSpend.setMerchantId(user.getMerchantId()); | |||
| final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); | |||
| return new ResultData(mapList); | |||
| @@ -56,7 +56,7 @@ public class WxDateAmountRecordController extends BaseController { | |||
| WxDateAmountRecord temp = new WxDateAmountRecord(); | |||
| WxMerchantBUser u = getUser(); | |||
| temp.setTenantId(u.getTenantId()); | |||
| temp.updateTenantInfo(u); | |||
| temp.setMerchantId(u.getMerchantId()); | |||
| temp.setType(dateAmtType); | |||
| temp.setSortColumns(BaseEntity.SortField.Date_DESC); | |||
| @@ -140,7 +140,7 @@ public class WxInfoController extends BaseController { | |||
| String ipaddress = IPUtil.getIpAddr(request); | |||
| WxBuser newUser = new WxBuser(); | |||
| newUser.setTenantId(wxAuthorizerInfo.getTenantId()); | |||
| newUser.updateTenantInfo(wxAuthorizerInfo); | |||
| newUser.setAppId(appId); | |||
| newUser.setOpenId(openId); | |||
| if (boolHaveUnionId) { | |||
| @@ -151,7 +151,7 @@ public class WxInfoController extends BaseController { | |||
| if (boolHaveUnionId) { | |||
| // 优先根据unionId查询 | |||
| WxBuser userQ = new WxBuser(); | |||
| userQ.setTenantId(wxAuthorizerInfo.getTenantId()); | |||
| userQ.updateTenantInfo(wxAuthorizerInfo); | |||
| userQ.setUnionId(unionId); | |||
| oldUser = wxBuserService.getByObject(userQ); | |||
| } | |||
| @@ -184,7 +184,7 @@ public class WxInfoController extends BaseController { | |||
| wxBuserTokenService.saveOrUpdate(oldUser); | |||
| } else { | |||
| // 新用户 | |||
| newUser.setTenantId(wxAuthorizerInfo.getTenantId()); | |||
| newUser.updateTenantInfo(wxAuthorizerInfo); | |||
| token = newUser.createToken(new Date()); | |||
| newUser.setRegisterIp(ipaddress); | |||
| newUser.setSessionKey(session_key); | |||
| @@ -34,7 +34,7 @@ public class WxMerchantSubsidyController extends BaseController { | |||
| logger.info("subsidy/sum: " + ipStr + " :" + wxMerchantSubsidy.toString()); | |||
| if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo(); | |||
| WxMerchantBUser user = getUser(); | |||
| wxMerchantSubsidy.setTenantId(user.getTenantId()); | |||
| wxMerchantSubsidy.updateTenantInfo(user); | |||
| wxMerchantSubsidy.setMerchantId(user.getMerchantId()); | |||
| List<Map<String, Object>> retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy); | |||
| return new ResultData(retMap); | |||
| @@ -50,7 +50,7 @@ public class WxMerchantSubsidyController extends BaseController { | |||
| logger.info("subsidy/list: " + ipStr + " :" + wxMerchantSubsidy.toString()); | |||
| if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo(); | |||
| WxMerchantBUser user = getUser(); | |||
| wxMerchantSubsidy.setTenantId(user.getTenantId()); | |||
| wxMerchantSubsidy.updateTenantInfo(user); | |||
| wxMerchantSubsidy.setMerchantId(user.getMerchantId()); | |||
| final PageInfo<WxMerchantSubsidyVo> page = wxMerchantSubsidyService.listAsPage(wxMerchantSubsidy, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| @@ -64,7 +64,7 @@ public class WxMerchantSubsidyController extends BaseController { | |||
| wxMerchantSubsidy = new WxMerchantSubsidyVo(); | |||
| } | |||
| WxMerchantBUser user = getUser(); | |||
| wxMerchantSubsidy.setTenantId(user.getTenantId()); | |||
| wxMerchantSubsidy.updateTenantInfo(user); | |||
| wxMerchantSubsidy.setMerchantId(user.getMerchantId()); | |||
| Map<String, Long> data = wxMerchantSubsidyService.summary(wxMerchantSubsidy); | |||
| return new ResultData(data); | |||
| @@ -64,8 +64,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| @GetMapping("findById") | |||
| public ResultData findById(WxMerchantTradeDaily wxMerchantTradeDaily) { | |||
| logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::findById"); | |||
| String tenantId = getTenantId(); | |||
| wxMerchantTradeDaily.setTenantId(tenantId); | |||
| wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); | |||
| return new ResultData(wxMerchantTradeDailyService.getById(wxMerchantTradeDaily.getId())); | |||
| } | |||
| @@ -78,7 +77,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| @PostMapping("saveOrUpdate") | |||
| public ResultData saveOrUpdate(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { | |||
| logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::saveOrUpdate"); | |||
| wxMerchantTradeDaily.setTenantId(super.getTenantId()); | |||
| wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); | |||
| if(wxMerchantTradeDaily.getTradeAmt()!= null){ | |||
| wxMerchantTradeDaily.setTradeAmt(Double.parseDouble(wxMerchantTradeDaily.getTradeAmt())*100 +""); | |||
| } | |||
| @@ -100,7 +100,7 @@ public class WxMicroPayController extends BaseController { | |||
| } | |||
| WxPayOrder record = new WxPayOrder(); | |||
| record.setTenantId(user.getTenantId()); | |||
| record.updateTenantInfo(user); | |||
| record.setOrderId(order.getId()); | |||
| record.setAuthCode(authCode); | |||
| record.setPayAmount(order.getPayment()); | |||
| @@ -153,7 +153,7 @@ public class WxMicroPayController extends BaseController { | |||
| } | |||
| WxPayOrder record = new WxPayOrder(); | |||
| record.setTenantId(user.getTenantId()); | |||
| record.updateTenantInfo(user); | |||
| record.setId(payOrderId); | |||
| record.setBUserId(user.getId()); | |||
| record.setOrderId(orderId); | |||
| @@ -307,7 +307,7 @@ public class WxMicroPayController extends BaseController { | |||
| cUser = wxCUserService.getById(cUserId); | |||
| } else { | |||
| WxCUser userQ = new WxCUser(); | |||
| userQ.setTenantId(user.getTenantId()); | |||
| userQ.updateTenantInfo(user); | |||
| userQ.setPhone(phone); | |||
| cUser = wxCUserService.getByObject(userQ); | |||
| } | |||
| @@ -438,7 +438,7 @@ public class WxMicroPayController extends BaseController { | |||
| } | |||
| WxPayOrder record = new WxPayOrder(); | |||
| record.setTenantId(user.getTenantId()); | |||
| record.updateTenantInfo(user); | |||
| record.setOrderId(microOrder.getId()); | |||
| record.setCUserId(microOrder.getCUserId()); | |||
| record.setAuthCode(authCode); | |||
| @@ -5,6 +5,7 @@ import com.iformall.common.ResultData; | |||
| import com.iformall.domain.po.WxMerchant; | |||
| import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.WxMsgValidationcode; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| import com.iformall.enums.*; | |||
| import com.iformall.service.WxMerchantBUserService; | |||
| import com.iformall.service.WxMerchantService; | |||
| @@ -66,7 +67,7 @@ public class WxMsgValidationcodeController extends BaseController { | |||
| } | |||
| WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); | |||
| wxMsgValidationcode.setTenantId(user.getTenantId()); | |||
| wxMsgValidationcode.updateTenantInfo(user); | |||
| wxMsgValidationcode.setPhone(phone); | |||
| wxMsgValidationcode.setType(EnumMsgModel.VALIDATION_CODE.getCode()); | |||
| wxMsgValidationcode.setAppid(appid); | |||
| @@ -82,7 +83,9 @@ public class WxMsgValidationcodeController extends BaseController { | |||
| @ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)}) | |||
| public ResultData hasvalidationcode(String tenantId, String phone, Integer type, String code, String appid) { | |||
| WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); | |||
| wxMsgValidationcode.setTenantId(tenantId); | |||
| wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{ | |||
| setTenantId(tenantId); | |||
| }}); | |||
| wxMsgValidationcode.setPhone(phone); | |||
| wxMsgValidationcode.setType(EnumMsgModel.VALIDATION_CODE.getCode()); | |||
| wxMsgValidationcode.setCode(code); | |||
| @@ -76,7 +76,7 @@ public class WxPayBillController extends BaseController { | |||
| record.setBillId(billId); | |||
| record.setOpenId(openid); | |||
| record.setbUserId(bUserId); | |||
| record.setTenantId(appInfo.getTenantId()); | |||
| record.updateTenantInfo(getTenantInfo()); | |||
| try { | |||
| record.setIp(IPUtil.getIpAddr(request)); | |||
| return wxPayBillService.createPayBill(appInfo, record, EnumPayWay.PAY_WAY_WECHAT); | |||
| @@ -287,7 +287,7 @@ public class PosBrunService { | |||
| // 1. 创建支付订单 | |||
| Date curDate = new Date(); | |||
| PosPayOrder posPayOrder = new PosPayOrder(); | |||
| posPayOrder.setTenantId(user.getTenantId()); | |||
| posPayOrder.updateTenantInfo(user); | |||
| posPayOrder.setCreateTime(curDate); | |||
| posPayOrder.setUpdateTime(curDate); | |||
| posPayOrder.setOrderId(posOrderId); | |||
| @@ -462,7 +462,7 @@ public class PosBrunService { | |||
| public ResultData posVerifyIndepent(WxMerchantBUser user, String couponOrderId, String payment) { | |||
| // 1. 创建 POS订单 | |||
| PosOrder posOrder = new PosOrder(); | |||
| posOrder.setTenantId(user.getTenantId()); | |||
| posOrder.updateTenantInfo(user); | |||
| posOrder.setType(EnumPosOrderType.VERIFY_INDEPENDENT.getCode()); | |||
| posOrder.setBuUserId(user.getId()); | |||
| posOrder.setOrderStatus(EnumPosOrderStatus.PENDING_VERIFY.getCode()); | |||
| @@ -482,7 +482,7 @@ public class PosBrunService { | |||
| // 2. 创建 POS支付订单 | |||
| Date curDate = new Date(); | |||
| PosPayOrder posPayOrder = new PosPayOrder(); | |||
| posPayOrder.setTenantId(user.getTenantId()); | |||
| posPayOrder.updateTenantInfo(user); | |||
| posPayOrder.setBuUserId(user.getId()); | |||
| posPayOrder.setOrderId(posOrder.getId()); | |||
| posPayOrder.setType(EnumPosPayType.PAY_VERIFY_INDEPENT.getCode()); | |||