zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

pull/2/head
js199000126 2023-05-26 15:12:09 +08:00
parent 8938ee67c7 ed48e31645
commit c7b67f2aae
9 changed files with 58 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java
View File

@ -9,7 +9,10 @@ import com.alibaba.ttl.TransmittableThreadLocal;
* @author 芋道源码 * @author 芋道源码
*/ */
public class TenantContextHolder { public class TenantContextHolder {
/**
* 套餐编号 - 系统
*/
public static final Long ID_SYSTEM = 1L;
/** /**
* 当前租户编号 * 当前租户编号
*/ */

2
yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/vo/order/WxPayJsResultVo.java
View File

@ -49,4 +49,6 @@ public class WxPayJsResultVo {
@Schema(description = "拉起收银台的ticket", required = true) @Schema(description = "拉起收银台的ticket", required = true)
private String ticket; private String ticket;
@Schema(description = "", required = true)
private String packageValue;
} }

18
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/product/StoreProductController.java
View File

@ -52,7 +52,7 @@ public class StoreProductController {
* @param request 搜索条件 * @param request 搜索条件
* @param pageParamRequest 分页参数 * @param pageParamRequest 分页参数
*/ */
// @PreAuthorize("@ss.hasPermission('admin:product:list')") @PreAuthorize("@ss.hasPermission('admin:product:list')")
@Operation(summary = "分页列表") //配合swagger使用 @Operation(summary = "分页列表") //配合swagger使用
@RequestMapping(value = "/list", method = RequestMethod.GET) @RequestMapping(value = "/list", method = RequestMethod.GET)
public CommonResult<PageInfo<StoreProductResponse>> getList(@Validated StoreProductSearchRequest request, public CommonResult<PageInfo<StoreProductResponse>> getList(@Validated StoreProductSearchRequest request,
@ -64,7 +64,7 @@ public class StoreProductController {
* 新增商品 * 新增商品
* @param request 新增参数 * @param request 新增参数
*/ */
// @PreAuthorize("@ss.hasPermission('admin:product:save')") @PreAuthorize("@ss.hasPermission('admin:product:save')")
@Operation(summary = "新增商品") @Operation(summary = "新增商品")
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
public CommonResult<Boolean> save(@RequestBody @Validated StoreProductAddRequest request) { public CommonResult<Boolean> save(@RequestBody @Validated StoreProductAddRequest request) {
@ -79,7 +79,7 @@ public class StoreProductController {
* 删除商品表 * 删除商品表
* @param id Integer * @param id Integer
*/ */
// @PreAuthorize("@ss.hasPermission('admin:product:delete')") @PreAuthorize("@ss.hasPermission('admin:product:delete')")
@Operation(summary = "删除") @Operation(summary = "删除")
@RequestMapping(value = "/delete/{id}", method = RequestMethod.GET) @RequestMapping(value = "/delete/{id}", method = RequestMethod.GET)
public CommonResult<Boolean> delete(@RequestBody @PathVariable Integer id, @RequestParam(value = "type", required = false, defaultValue = "recycle")String type) { public CommonResult<Boolean> delete(@RequestBody @PathVariable Integer id, @RequestParam(value = "type", required = false, defaultValue = "recycle")String type) {
@ -99,7 +99,7 @@ public class StoreProductController {
* 恢复已删除商品表 * 恢复已删除商品表
* @param id Integer * @param id Integer
*/ */
// @PreAuthorize("@ss.hasPermission('admin:product:restore')") @PreAuthorize("@ss.hasPermission('admin:product:restore')")
@Operation(summary = "恢复商品") @Operation(summary = "恢复商品")
@RequestMapping(value = "/restore/{id}", method = RequestMethod.GET) @RequestMapping(value = "/restore/{id}", method = RequestMethod.GET)
public CommonResult<Boolean> restore(@RequestBody @PathVariable Integer id) { public CommonResult<Boolean> restore(@RequestBody @PathVariable Integer id) {
@ -114,7 +114,7 @@ public class StoreProductController {
* 商品修改 * 商品修改
* @param storeProductRequest 商品参数 * @param storeProductRequest 商品参数
*/ */
// @PreAuthorize("@ss.hasPermission('admin:product:update')") @PreAuthorize("@ss.hasPermission('admin:product:update')")
@Operation(summary = "商品修改") @Operation(summary = "商品修改")
@RequestMapping(value = "/update", method = RequestMethod.POST) @RequestMapping(value = "/update", method = RequestMethod.POST)
public CommonResult<Boolean> update(@RequestBody @Validated StoreProductAddRequest storeProductRequest) { public CommonResult<Boolean> update(@RequestBody @Validated StoreProductAddRequest storeProductRequest) {
@ -129,7 +129,7 @@ public class StoreProductController {
* 商品详情 * 商品详情
* @param id 商品id * @param id 商品id
*/ */
// @PreAuthorize("@ss.hasPermission('admin:product:info')") @PreAuthorize("@ss.hasPermission('admin:product:info')")
@Operation(summary = "商品详情") @Operation(summary = "商品详情")
@RequestMapping(value = "/info/{id}", method = RequestMethod.GET) @RequestMapping(value = "/info/{id}", method = RequestMethod.GET)
public CommonResult<StoreProductInfoResponse> info(@PathVariable Integer id) { public CommonResult<StoreProductInfoResponse> info(@PathVariable Integer id) {
@ -139,7 +139,7 @@ public class StoreProductController {
/** /**
* 商品tabs表头数据 * 商品tabs表头数据
*/ */
// @PreAuthorize("@ss.hasPermission('admin:product:tabs:headers')") @PreAuthorize("@ss.hasPermission('admin:product:tabs:headers')")
@Operation(summary = "商品表头数量") @Operation(summary = "商品表头数量")
@RequestMapping(value = "/tabs/headers", method = RequestMethod.GET) @RequestMapping(value = "/tabs/headers", method = RequestMethod.GET)
public CommonResult<List<StoreProductTabsHeader>> getTabsHeader() { public CommonResult<List<StoreProductTabsHeader>> getTabsHeader() {
@ -149,7 +149,7 @@ public class StoreProductController {
/** /**
* 上架 * 上架
*/ */
// @PreAuthorize("@ss.hasPermission('admin:product:up')") @PreAuthorize("@ss.hasPermission('admin:product:up')")
@Operation(summary = "上架") @Operation(summary = "上架")
@RequestMapping(value = "/putOnShell/{id}", method = RequestMethod.GET) @RequestMapping(value = "/putOnShell/{id}", method = RequestMethod.GET)
public CommonResult<Boolean> putOn(@PathVariable Integer id) { public CommonResult<Boolean> putOn(@PathVariable Integer id) {
@ -163,7 +163,7 @@ public class StoreProductController {
/** /**
* 下架 * 下架
*/ */
// @PreAuthorize("@ss.hasPermission('admin:product:down')") @PreAuthorize("@ss.hasPermission('admin:product:down')")
@Operation(summary = "下架") @Operation(summary = "下架")
@RequestMapping(value = "/offShell/{id}", method = RequestMethod.GET) @RequestMapping(value = "/offShell/{id}", method = RequestMethod.GET)
public CommonResult<Boolean> offShell(@PathVariable Integer id) { public CommonResult<Boolean> offShell(@PathVariable Integer id) {

4
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.shop.controller.admin.recharge;
import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated; import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.module.shop.controller.admin.recharge.method.Excel; import cn.iocoder.yudao.module.shop.controller.admin.recharge.method.Excel;
import cn.iocoder.yudao.module.shop.convert.recharge.RechargeOrderInfoConvert; import cn.iocoder.yudao.module.shop.convert.recharge.RechargeOrderInfoConvert;
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderInfoDO; import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderInfoDO;
@ -102,6 +103,9 @@ public class RechargeOrderController {
@PreAuthorize("@ss.hasPermission('shop:recharge-order:query')") @PreAuthorize("@ss.hasPermission('shop:recharge-order:query')")
@TenantIgnore @TenantIgnore
public CommonResult<PageResult<RechargeOrderRespVO>> getRechargeOrderPage(@Valid RechargeOrderPageReqVO pageVO) { public CommonResult<PageResult<RechargeOrderRespVO>> getRechargeOrderPage(@Valid RechargeOrderPageReqVO pageVO) {
if(!TenantContextHolder.ID_SYSTEM.equals(TenantContextHolder.getRequiredTenantId())){
pageVO.setTenantId(TenantContextHolder.getRequiredTenantId());
}
pageVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId()); pageVO.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId());
PageResult<RechargeOrderRespVO> pageResult = rechargeOrderService.getRechargeOrderPage(pageVO); PageResult<RechargeOrderRespVO> pageResult = rechargeOrderService.getRechargeOrderPage(pageVO);
return success(pageResult); return success(pageResult);

39
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderPayServiceImpl.java
View File

@ -245,25 +245,29 @@ public class OrderPayServiceImpl implements OrderPayService {
// 微信支付，调用微信预下单，返回拉起微信支付需要的信息 // 微信支付，调用微信预下单，返回拉起微信支付需要的信息
if (storeOrder.getPayType().equals(PayConstants.PAY_TYPE_WE_CHAT)) { if (storeOrder.getPayType().equals(PayConstants.PAY_TYPE_WE_CHAT)) {
// 预下单 // 预下单
Map<String, String> unifiedorder = unifiedorder(storeOrder, ip, orderPayRequest.getOpenid()); WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result = unifiedorder(storeOrder, ip, orderPayRequest.getOpenid());
WxPayService wxPayService = wxPayOneAutoConfiguration.wxPayOneService();
WxPayUnifiedOrderV3Result.JsapiResult jsapiResult = wxPayUnifiedOrderV3Result.getPayInfo(TradeTypeEnum.JSAPI, payProperties.getAppId(), payProperties.getMchId(), wxPayService.getConfig().getPrivateKey());
response.setStatus(true); response.setStatus(true);
WxPayJsResultVo vo = new WxPayJsResultVo(); WxPayJsResultVo vo = new WxPayJsResultVo();
vo.setAppId(unifiedorder.get("appId"));
vo.setNonceStr(unifiedorder.get("nonceStr")); vo.setAppId(/*unifiedorder.get("appId")*/jsapiResult.getAppId());
vo.setPackages(unifiedorder.get("package")); vo.setNonceStr(/*unifiedorder.get("nonceStr")*/jsapiResult.getNonceStr());
vo.setSignType(unifiedorder.get("signType")); // vo.setPackages(unifiedorder.get("package"));
vo.setTimeStamp(unifiedorder.get("timeStamp")); vo.setPackageValue(jsapiResult.getPackageValue());
vo.setPaySign(unifiedorder.get("paySign")); vo.setSignType(/*unifiedorder.get("signType")*/jsapiResult.getSignType());
vo.setTimeStamp(/*unifiedorder.get("timeStamp")*/jsapiResult.getTimeStamp());
vo.setPaySign(/*unifiedorder.get("paySign")*/jsapiResult.getPaySign());
if (storeOrder.getIsChannel() == 2) { if (storeOrder.getIsChannel() == 2) {
vo.setMwebUrl(unifiedorder.get("mweb_url")); vo.setMwebUrl(wxPayUnifiedOrderV3Result.getH5Url());
response.setPayType(PayConstants.PAY_CHANNEL_WE_CHAT_H5); response.setPayType(PayConstants.PAY_CHANNEL_WE_CHAT_H5);
} }
if (storeOrder.getIsChannel() == 4 || storeOrder.getIsChannel() == 5) { // if (storeOrder.getIsChannel() == 4 || storeOrder.getIsChannel() == 5) {
vo.setPartnerid(unifiedorder.get("partnerid")); // vo.setPartnerid(unifiedorder.get("partnerid"));
} // }
// 更新商户订单号 // 更新商户订单号
storeOrder.setOutTradeNo(unifiedorder.get("outTradeNo")); // storeOrder.setOutTradeNo(unifiedorder.get("outTradeNo"));
storeOrderService.updateById(storeOrder); // storeOrderService.updateById(storeOrder);
response.setJsConfig(vo); response.setJsConfig(vo);
return response; return response;
} }
@ -287,7 +291,7 @@ public class OrderPayServiceImpl implements OrderPayService {
* @param ip ip * @param ip ip
* @return 预下单返回对象 * @return 预下单返回对象
*/ */
private Map<String, String> unifiedorder(StoreOrder storeOrder, String ip,String openid) { private WxPayUnifiedOrderV3Result unifiedorder(StoreOrder storeOrder, String ip,String openid) {
// 获取用户openId // 获取用户openId
// 根据订单支付类型来判断获取公众号openId还是小程序openId // 根据订单支付类型来判断获取公众号openId还是小程序openId
@ -316,7 +320,7 @@ public class OrderPayServiceImpl implements OrderPayService {
// 预下单（统一下单） // 预下单（统一下单）
//CreateOrderResponseVo responseVo = wechatNewService.payUnifiedorder(unifiedorderVo); //CreateOrderResponseVo responseVo = wechatNewService.payUnifiedorder(unifiedorderVo);
// 组装前端预下单参数 // 组装前端预下单参数
Map<String, String> map = new HashMap<>(); // Map<String, String> map = new HashMap<>();
// map.put("appId", unifiedorderVo.getAppid()); // map.put("appId", unifiedorderVo.getAppid());
// map.put("nonceStr", unifiedorderVo.getAppid()); // map.put("nonceStr", unifiedorderVo.getAppid());
// map.put("package", "prepay_id=".concat(responseVo.getPrepayId())); // map.put("package", "prepay_id=".concat(responseVo.getPrepayId()));
@ -348,11 +352,12 @@ public class OrderPayServiceImpl implements OrderPayService {
wxPayRequest.setTimeExpire(formatLocalDateTime(LocalDateTime.now().plusMinutes(30), "yyyyMMddHHmmss")); wxPayRequest.setTimeExpire(formatLocalDateTime(LocalDateTime.now().plusMinutes(30), "yyyyMMddHHmmss"));
try { try {
WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result = wxPayService.unifiedOrderV3(TradeTypeEnum.JSAPI, wxPayRequest); WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result = wxPayService.unifiedOrderV3(TradeTypeEnum.JSAPI, wxPayRequest);
map.put("mweb_url",wxPayUnifiedOrderV3Result.getH5Url()); // map.put("mweb_url",wxPayUnifiedOrderV3Result.getH5Url());
return wxPayUnifiedOrderV3Result;
} catch (Exception e) { } catch (Exception e) {
e.getMessage(); e.getMessage();
} }
return map; return null;
} }
public static String formatLocalDateTime(LocalDateTime localDateTime, String pattern) { public static String formatLocalDateTime(LocalDateTime localDateTime, String pattern) {
return localDateTime.format(DateTimeFormatter.ofPattern(pattern)); return localDateTime.format(DateTimeFormatter.ofPattern(pattern));

12
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
View File

@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.*; import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant.*;
import cn.iocoder.yudao.module.system.convert.tenant.TenantConvert; import cn.iocoder.yudao.module.system.convert.tenant.TenantConvert;
import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO; import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantDO;
@ -96,7 +97,16 @@ public class TenantController {
PageResult<TenantDO> pageResult = tenantService.getTenantPage(pageVO); PageResult<TenantDO> pageResult = tenantService.getTenantPage(pageVO);
return success(TenantConvert.INSTANCE.convertPage(pageResult)); return success(TenantConvert.INSTANCE.convertPage(pageResult));
} }
@GetMapping("/list")
@Operation(summary = "获取所有商户")
public CommonResult<List<TenantRespVO>> list(@Valid TenantExportReqVO pageVO) {
List<TenantDO> pageResult = null;
if(!TenantContextHolder.ID_SYSTEM.equals(TenantContextHolder.getRequiredTenantId())){
pageVO.setTenantId(TenantContextHolder.getRequiredTenantId());
}
pageResult = tenantService.getTenantList(pageVO);
return success(TenantConvert.INSTANCE.convertList(pageResult));
}
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出租户 Excel") @Operation(summary = "导出租户 Excel")
@PreAuthorize("@ss.hasPermission('system:tenant:export')") @PreAuthorize("@ss.hasPermission('system:tenant:export')")

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantExportReqVO.java
View File

@ -14,6 +14,8 @@ public class TenantExportReqVO {
@Schema(description = "租户名", example = "芋道") @Schema(description = "租户名", example = "芋道")
private String name; private String name;
@Schema(description = "tenantId", example = "芋道")
private Long tenantId;
@Schema(description = "联系人", example = "芋艿") @Schema(description = "联系人", example = "芋艿")
private String contactName; private String contactName;

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantMapper.java
View File

@ -36,6 +36,7 @@ public interface TenantMapper extends BaseMapperX<TenantDO> {
.likeIfPresent(TenantDO::getContactName, reqVO.getContactName()) .likeIfPresent(TenantDO::getContactName, reqVO.getContactName())
.likeIfPresent(TenantDO::getContactMobile, reqVO.getContactMobile()) .likeIfPresent(TenantDO::getContactMobile, reqVO.getContactMobile())
.eqIfPresent(TenantDO::getStatus, reqVO.getStatus()) .eqIfPresent(TenantDO::getStatus, reqVO.getStatus())
.eqIfPresent(TenantDO::getId, reqVO.getTenantId())
.betweenIfPresent(TenantDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(TenantDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(TenantDO::getId)); .orderByDesc(TenantDO::getId));
} }

6
yudao-server/src/main/resources/application-prod.yaml
View File

@ -235,10 +235,10 @@ wx:
useRedis: false useRedis: false
defaultContent: \u60A8\u597D\uFF0C\u6709\u4EC0\u4E48\u95EE\u9898\uFF1F defaultContent: \u60A8\u597D\uFF0C\u6709\u4EC0\u4E48\u95EE\u9898\uFF1F
redisConfig: redisConfig:
host: 117.33.142.185 # 地址 host: 47.109.92.244 # 地址
port: 6369 # 端口 port: 6399 # 端口
database: 16 # 数据库索引 database: 16 # 数据库索引
password: 20221122@dev # 密码，建议生产环境开启 password: cyywl123.. # 密码，建议生产环境开启
phone: phone:
query-url: http://cy-phone-bill-inquiry-server:4006/cyywl-phone-query-api/ query-url: http://cy-phone-bill-inquiry-server:4006/cyywl-phone-query-api/
token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0 token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0