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

Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 

# Conflicts:
#	yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
pull/2/head
perry 2023-05-24 16:03:33 +08:00
parent 749e4b7459 be58048ce7
commit b87a5d35a7
41 changed files with 1078 additions and 597 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/config/ApiConfigApi.java
View File

@ -24,4 +24,5 @@ public interface ApiConfigApi {
* </pre> * </pre>
*/ */
CommonResult<String> getConfigKey( String key); CommonResult<String> getConfigKey( String key);
String getConfigKeyValue( String key);
} }

12
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/config/ApiConfigImpl.java
View File

@ -50,4 +50,16 @@ public class ApiConfigImpl implements ApiConfigApi{
} }
return success(config.getValue()); return success(config.getValue());
} }
@Override
public String getConfigKeyValue(String key) {
ConfigDO config = configService.getConfigByKey(key);
if (config == null) {
return null;
}
if (!config.getVisible()) {
throw exception(ErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_VISIBLE);
}
return config.getValue();
}
} }

4
yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/request/order/CreateOrderRequest.java
View File

@ -40,10 +40,10 @@ public class CreateOrderRequest implements Serializable {
private Integer shippingType; private Integer shippingType;
@Schema(description = "收货地址id") @Schema(description = "收货地址id")
private Integer addressId; private Long addressId;
@Schema(description = "优惠券编号") @Schema(description = "优惠券编号")
private Integer couponId; private Long couponId;
@Schema(description = "支付类型:weixin-微信支付，yue-余额支付,alipay-支付宝支付") @Schema(description = "支付类型:weixin-微信支付，yue-余额支付,alipay-支付宝支付")
@NotBlank(message = "支付类型不能为空") @NotBlank(message = "支付类型不能为空")

4
yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/request/order/OrderComputedPriceRequest.java
View File

@ -32,10 +32,10 @@ public class OrderComputedPriceRequest {
private String preOrderNo; private String preOrderNo;
@Schema(description = "地址id") @Schema(description = "地址id")
private Integer addressId; private Long addressId;
@Schema(description = "优惠券id") @Schema(description = "优惠券id")
private Integer couponId; private Long couponId;
@Schema(description = "快递类型: 1-快递配送，2-到店自提") @Schema(description = "快递类型: 1-快递配送，2-到店自提")
@NotNull(message = "快递类型不能为空") @NotNull(message = "快递类型不能为空")

3
yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/request/product/StoreProductAttrValueAddRequest.java
View File

@ -72,6 +72,9 @@ public class StoreProductAttrValueAddRequest implements Serializable {
@DecimalMin(value = "0", message = "原价不能小于0") @DecimalMin(value = "0", message = "原价不能小于0")
private BigDecimal otPrice; private BigDecimal otPrice;
@Schema(description= "商品条码（一维码）")
private String barCode;
@Schema(description= "重量", required = true) @Schema(description= "重量", required = true)
@NotNull(message = "规格属性重量不能为空") @NotNull(message = "规格属性重量不能为空")
@DecimalMin(value = "0", message = "重量不能小于0") @DecimalMin(value = "0", message = "重量不能小于0")

3
yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/response/product/AttrValueResponse.java
View File

@ -54,6 +54,9 @@ public class AttrValueResponse implements Serializable {
@Schema(description= "原价") @Schema(description= "原价")
private BigDecimal otPrice; private BigDecimal otPrice;
@Schema(description= "商品条码（一维码）")
private String barCode;
@Schema(description= "重量") @Schema(description= "重量")
private BigDecimal weight; private BigDecimal weight;

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

@ -45,7 +45,7 @@ public class OrderInfoVo {
private BigDecimal payFee; private BigDecimal payFee;
@Schema(description = "地址id") @Schema(description = "地址id")
private Integer addressId; private Long addressId;
@Schema(description = "收货人姓名(前端用)") @Schema(description = "收货人姓名(前端用)")
private String realName; private String realName;

3
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesFreeRespVO.java
View File

@ -48,4 +48,7 @@ public class ShippingTemplatesFreeRespVO implements Serializable {
@NotNull(message = "请填写包邮金额") @NotNull(message = "请填写包邮金额")
@DecimalMin(value = "0", message = "包邮金额不能低于0") @DecimalMin(value = "0", message = "包邮金额不能低于0")
private BigDecimal price; private BigDecimal price;
@Schema(description = "分组唯一值", required = true)
private String uniqid;
} }

3
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesNoDeliveryRespVO.java
View File

@ -34,7 +34,8 @@ public class ShippingTemplatesNoDeliveryRespVO implements Serializable {
@NotNull(message = "请选择城市") @NotNull(message = "请选择城市")
private String cityId; private String cityId;
@Schema(description = "分组唯一值", required = true)
private String uniqid;
@Schema(description = "省ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4") @Schema(description = "省ID, 多个逗号分割。 全国 all", required = true, example = "1,2,3,4")
private String provinceId; private String provinceId;

3
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesRegionRespVO.java
View File

@ -55,4 +55,7 @@ public class ShippingTemplatesRegionRespVO implements Serializable {
@DecimalMin(value = "0.1", message = "续件运费金额不能低于0.1") @DecimalMin(value = "0.1", message = "续件运费金额不能低于0.1")
private BigDecimal renewalPrice; private BigDecimal renewalPrice;
@Schema(description = "分组唯一值", required = true)
private String uniqid;
} }

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/vo/ShippingTemplatesReqVO.java
View File

@ -57,7 +57,7 @@ public class ShippingTemplatesReqVO implements Serializable {
private Boolean noDelivery; private Boolean noDelivery;
@Schema(description = "指定不送设置", required = true) @Schema(description = "指定不送设置", required = true)
private List<ShippingTemplatesNoDeliveryRespVO> shippingTemplatesNoDeliveryRespVOS; private ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVOS;
@Schema(description = "排序", example = "0") @Schema(description = "排序", example = "0")
@NotNull(message = "排序数字必须填写") @NotNull(message = "排序数字必须填写")

1
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesDO.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.shop.dal.dataobject.express; package cn.iocoder.yudao.module.shop.dal.dataobject.express;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;

5
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java
View File

@ -45,5 +45,10 @@ public class ShippingTemplatesNoDeliveryDO implements Serializable {
private Integer provinceId; private Integer provinceId;
/**
* 分组唯一值
*/
private String uniqid;
} }

5
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java
View File

@ -43,6 +43,11 @@ public class ShippingTemplatesRegionDO implements Serializable {
*/ */
private Integer cityId; private Integer cityId;
/**
* 分组唯一值
*/
private String uniqid;
private Integer provinceId; private Integer provinceId;

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/order/StoreOrder.java
View File

@ -74,7 +74,7 @@ public class StoreOrder implements Serializable {
private BigDecimal deductionPrice; private BigDecimal deductionPrice;
@Schema(description = "优惠券id") @Schema(description = "优惠券id")
private Integer couponId; private Long couponId;
@Schema(description = "优惠券金额") @Schema(description = "优惠券金额")
private BigDecimal couponPrice; private BigDecimal couponPrice;

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesNoDeliveryService.java
View File

@ -25,7 +25,7 @@ import java.util.List;
@Validated @Validated
public interface ShippingTemplatesNoDeliveryService extends IService<ShippingTemplatesNoDeliveryDO> { public interface ShippingTemplatesNoDeliveryService extends IService<ShippingTemplatesNoDeliveryDO> {
void saveAll(List<ShippingTemplatesNoDeliveryRespVO> shippingTemplatesFreeRespVOList, Integer id); void saveAll(ShippingTemplatesNoDeliveryRespVO shippingTemplatesFreeRespVOList, Integer id);
List<ShippingTemplatesNoDeliveryRespVO> getListGroup(Integer tempId); List<ShippingTemplatesNoDeliveryRespVO> getListGroup(Integer tempId);

27
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesNoDeliveryServiceImpl.java
View File

@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesNoDeliver
import cn.iocoder.yudao.module.shop.service.express.ShippingTemplatesNoDeliveryService; import cn.iocoder.yudao.module.shop.service.express.ShippingTemplatesNoDeliveryService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -36,22 +37,22 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl<Shipping
* @since 2020-05-20 * @since 2020-05-20
*/ */
@Override @Override
public void saveAll(List<ShippingTemplatesNoDeliveryRespVO> shippingTemplatesNoDeliveryRespVOS, Integer tempId) { public void saveAll(ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVOS, Integer tempId) {
ArrayList<ShippingTemplatesNoDeliveryDO> shippingTemplatesNoDeliveryDOS = new ArrayList<>(); ArrayList<ShippingTemplatesNoDeliveryDO> shippingTemplatesNoDeliveryDOS = new ArrayList<>();
delete(tempId); delete(tempId);
for (ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO : shippingTemplatesNoDeliveryRespVOS) { String uniqueKey = DigestUtils.md5Hex(shippingTemplatesNoDeliveryRespVOS.toString());
if(shippingTemplatesNoDeliveryRespVO.getCityId().equals("all") || shippingTemplatesNoDeliveryRespVO.getCityId().equals("0")){ if(shippingTemplatesNoDeliveryRespVOS.getCityId().equals("all") || shippingTemplatesNoDeliveryRespVOS.getCityId().equals("0")){
cityIdList = getCityIdList(); cityIdList = getCityIdList();
}else{ }else{
cityIdList = StrUtils.stringToArray(shippingTemplatesNoDeliveryRespVO.getCityId()); cityIdList = StrUtils.stringToArray(shippingTemplatesNoDeliveryRespVOS.getCityId());
} }
for (Integer cityId: cityIdList) { for (Integer cityId: cityIdList) {
ShippingTemplatesNoDeliveryDO shippingTemplatesNoDeliveryDO = new ShippingTemplatesNoDeliveryDO(); ShippingTemplatesNoDeliveryDO shippingTemplatesNoDeliveryDO = new ShippingTemplatesNoDeliveryDO();
shippingTemplatesNoDeliveryDO.setCityId(cityId); shippingTemplatesNoDeliveryDO.setCityId(cityId);
shippingTemplatesNoDeliveryDO.setTempId(tempId); shippingTemplatesNoDeliveryDO.setUniqid(uniqueKey);
shippingTemplatesNoDeliveryDOS.add(shippingTemplatesNoDeliveryDO); shippingTemplatesNoDeliveryDO.setTempId(tempId);
} shippingTemplatesNoDeliveryDOS.add(shippingTemplatesNoDeliveryDO);
} }
//批量保存模板数据 //批量保存模板数据
saveBatch(shippingTemplatesNoDeliveryDOS); saveBatch(shippingTemplatesNoDeliveryDOS);

1
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java
View File

@ -78,6 +78,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl<ShippingTemp
for (Integer cityId: cityIdList) { for (Integer cityId: cityIdList) {
ShippingTemplatesRegionDO shippingTemplatesRegionDO = new ShippingTemplatesRegionDO(); ShippingTemplatesRegionDO shippingTemplatesRegionDO = new ShippingTemplatesRegionDO();
shippingTemplatesRegionDO.setCityId(cityId); shippingTemplatesRegionDO.setCityId(cityId);
shippingTemplatesRegionDO.setUniqid(uniqueKey);
// shippingTemplatesRegionDO.setTitle(shippingTemplatesRegionRespVO.getTitle()); // shippingTemplatesRegionDO.setTitle(shippingTemplatesRegionRespVO.getTitle());
shippingTemplatesRegionDO.setRenewal(shippingTemplatesRegionRespVO.getRenewal()); shippingTemplatesRegionDO.setRenewal(shippingTemplatesRegionRespVO.getRenewal());
shippingTemplatesRegionDO.setRenewalPrice(shippingTemplatesRegionRespVO.getRenewalPrice()); shippingTemplatesRegionDO.setRenewalPrice(shippingTemplatesRegionRespVO.getRenewalPrice());

13
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java
View File

@ -109,12 +109,11 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), shippingTemplatesDO.getId()); shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), shippingTemplatesDO.getId());
} }
List<ShippingTemplatesNoDeliveryRespVO> shippingTemplatesNoDeliveryRespVOList = request.getShippingTemplatesNoDeliveryRespVOS(); ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO = request.getShippingTemplatesNoDeliveryRespVOS();
if(null != shippingTemplatesNoDeliveryRespVOList && shippingTemplatesNoDeliveryRespVOList.size() > 0){ if(!ObjectUtil.isNull(shippingTemplatesNoDeliveryRespVO)){
shippingTemplatesNoDeliveryService.saveAll(shippingTemplatesNoDeliveryRespVOList, shippingTemplatesDO.getId()); shippingTemplatesNoDeliveryService.saveAll(shippingTemplatesNoDeliveryRespVO, shippingTemplatesDO.getId());
} }
return true; return true;
} }
@ -169,9 +168,9 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
if(CollUtil.isNotEmpty(shippingTemplatesFreeRespVOList) && request.getAppoint()){ if(CollUtil.isNotEmpty(shippingTemplatesFreeRespVOList) && request.getAppoint()){
shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), shippingTemplatesDO.getId()); shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), shippingTemplatesDO.getId());
} }
List<ShippingTemplatesNoDeliveryRespVO> shippingTemplatesNoDeliveryRespVOList = request.getShippingTemplatesNoDeliveryRespVOS(); ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO= request.getShippingTemplatesNoDeliveryRespVOS();
if(CollUtil.isNotEmpty(shippingTemplatesNoDeliveryRespVOList)){ if(ObjectUtil.isNotNull(shippingTemplatesNoDeliveryRespVO)){
shippingTemplatesNoDeliveryService.saveAll(shippingTemplatesNoDeliveryRespVOList, shippingTemplatesDO.getId()); shippingTemplatesNoDeliveryService.saveAll(shippingTemplatesNoDeliveryRespVO, shippingTemplatesDO.getId());
} }
return true; return true;

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

@ -6,7 +6,9 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.module.member.api.address.AddressApi; import cn.iocoder.yudao.module.member.api.address.AddressApi;
import cn.iocoder.yudao.module.member.api.address.UserAddressApi;
import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO; import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
import cn.iocoder.yudao.module.member.api.address.dto.UserAddressRespDTO;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi; import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
import cn.iocoder.yudao.module.shop.constants.PayConstants; import cn.iocoder.yudao.module.shop.constants.PayConstants;
@ -19,14 +21,21 @@ import cn.iocoder.yudao.module.shop.constants.SysConfigConstants;
import cn.iocoder.yudao.module.shop.convert.order.StoreOrderConvert; import cn.iocoder.yudao.module.shop.convert.order.StoreOrderConvert;
import cn.iocoder.yudao.module.shop.convert.order.StoreOrderOneConvert; import cn.iocoder.yudao.module.shop.convert.order.StoreOrderOneConvert;
import cn.iocoder.yudao.module.shop.dal.dataobject.cat.StoreCart; import cn.iocoder.yudao.module.shop.dal.dataobject.cat.StoreCart;
import cn.iocoder.yudao.module.shop.dal.dataobject.express.ShippingTemplatesDO;
import cn.iocoder.yudao.module.shop.dal.dataobject.express.ShippingTemplatesFreeDO;
import cn.iocoder.yudao.module.shop.dal.dataobject.express.ShippingTemplatesRegionDO;
import cn.iocoder.yudao.module.shop.dal.dataobject.order.StoreOrder; import cn.iocoder.yudao.module.shop.dal.dataobject.order.StoreOrder;
import cn.iocoder.yudao.module.shop.dal.dataobject.order.StoreOrderInfo; import cn.iocoder.yudao.module.shop.dal.dataobject.order.StoreOrderInfo;
import cn.iocoder.yudao.module.shop.dal.dataobject.product.StoreProduct; import cn.iocoder.yudao.module.shop.dal.dataobject.product.StoreProduct;
import cn.iocoder.yudao.module.shop.dal.dataobject.product.StoreProductAttrValue; import cn.iocoder.yudao.module.shop.dal.dataobject.product.StoreProductAttrValue;
import cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesMapper;
import cn.iocoder.yudao.module.shop.dal.mysql.order.StoreOrderMapper; import cn.iocoder.yudao.module.shop.dal.mysql.order.StoreOrderMapper;
import cn.iocoder.yudao.module.shop.request.order.*; import cn.iocoder.yudao.module.shop.request.order.*;
import cn.iocoder.yudao.module.shop.request.product.StoreProductReplyAddRequest; import cn.iocoder.yudao.module.shop.request.product.StoreProductReplyAddRequest;
import cn.iocoder.yudao.module.shop.response.order.*; import cn.iocoder.yudao.module.shop.response.order.*;
import cn.iocoder.yudao.module.shop.service.express.ShippingTemplatesFreeService;
import cn.iocoder.yudao.module.shop.service.express.ShippingTemplatesRegionService;
import cn.iocoder.yudao.module.shop.service.express.ShippingTemplatesService;
import cn.iocoder.yudao.module.shop.service.order.OrderService; import cn.iocoder.yudao.module.shop.service.order.OrderService;
import cn.iocoder.yudao.module.shop.service.order.StoreOrderInfoService; import cn.iocoder.yudao.module.shop.service.order.StoreOrderInfoService;
import cn.iocoder.yudao.module.shop.service.order.StoreOrderService; import cn.iocoder.yudao.module.shop.service.order.StoreOrderService;
@ -110,16 +119,18 @@ public class OrderServiceImpl implements OrderService {
@Autowired @Autowired
private AddressApi addressApi; private AddressApi addressApi;
@Autowired
private UserAddressApi userAddressApi;
// @Autowired @Autowired
// private ShippingTemplatesApi shippingTemplatesApi; private ShippingTemplatesService shippingTemplatesApi;
//
// @Autowired @Autowired
// private ShippingTemplatesFreeApi shippingTemplatesFreeApi; private ShippingTemplatesFreeService shippingTemplatesFreeApi;
//
// @Autowired @Autowired
// private ShippingTemplatesRegionApi shippingTemplatesRegionApi; private ShippingTemplatesRegionService shippingTemplatesRegionApi;
@Autowired @Autowired
private StoreProductService storeProductService; private StoreProductService storeProductService;
@ -601,116 +612,116 @@ public class OrderServiceImpl implements OrderService {
/** /**
* 计算订单运费 * 计算订单运费
*/ */
private void getFreightFee(OrderInfoVo orderInfoVo, AddressRespDTO userAddress) { private void getFreightFee(OrderInfoVo orderInfoVo, UserAddressRespDTO userAddress) {
// // 判断是否满额包邮 type=1按件数 2按重量 3按体积 // 判断是否满额包邮 type=1按件数 2按重量 3按体积
// // 全场满额包邮开关 // 全场满额包邮开关
// String postageSwitchString = apiConfigApi.getConfigKey(SysConfigConstants.STORE_FEE_POSTAGE_SWITCH).toString(); String postageSwitchString = apiConfigApi.getConfigKey(SysConfigConstants.STORE_FEE_POSTAGE_SWITCH).toString();
// // 全场满额包邮金额 // 全场满额包邮金额
// String storeFreePostageString = apiConfigApi.getConfigKey(SysConfigConstants.STORE_FEE_POSTAGE).toString(); String storeFreePostageString = apiConfigApi.getConfigKey(SysConfigConstants.STORE_FEE_POSTAGE).toString();
// BigDecimal storePostage = BigDecimal.ZERO; BigDecimal storePostage = BigDecimal.ZERO;
// if (postageSwitchString.equals("true") && (storeFreePostageString.equals("0") || orderInfoVo.getProTotalFee().compareTo(new BigDecimal(storeFreePostageString)) >= 0)) { if (postageSwitchString.equals("true") && (storeFreePostageString.equals("0") || orderInfoVo.getProTotalFee().compareTo(new BigDecimal(storeFreePostageString)) >= 0)) {
// storePostage = BigDecimal.ZERO; storePostage = BigDecimal.ZERO;
// } else if (ObjectUtil.isNull(userAddress) || userAddress.getCityId() <= 0) { } else if (ObjectUtil.isNull(userAddress) || userAddress.getCityId() <= 0) {
// // 用户地址不存在，默认运费为0元 // 用户地址不存在，默认运费为0元
// storePostage = BigDecimal.ZERO; storePostage = BigDecimal.ZERO;
// } else { } else {
// // 有用户地址的情况下 // 有用户地址的情况下
// // 运费根据商品计算 // 运费根据商品计算
// Map<Integer, MyRecord> proMap = new HashMap<>(); Map<Integer, MyRecord> proMap = new HashMap<>();
// orderInfoVo.getOrderDetailList().forEach(e -> { orderInfoVo.getOrderDetailList().forEach(e -> {
// Integer proId = e.getProductId(); Integer proId = e.getProductId();
// if (proMap.containsKey(proId)) { if (proMap.containsKey(proId)) {
// MyRecord record = proMap.get(proId); MyRecord record = proMap.get(proId);
// record.set("totalPrice", record.getBigDecimal("totalPrice").add(e.getPrice().multiply(BigDecimal.valueOf(e.getPayNum())))); record.set("totalPrice", record.getBigDecimal("totalPrice").add(e.getPrice().multiply(BigDecimal.valueOf(e.getPayNum()))));
// record.set("totalNum", record.getInt("totalNum") + e.getPayNum()); record.set("totalNum", record.getInt("totalNum") + e.getPayNum());
// BigDecimal weight = e.getWeight().multiply(BigDecimal.valueOf(e.getPayNum())); BigDecimal weight = e.getWeight().multiply(BigDecimal.valueOf(e.getPayNum()));
// record.set("weight", record.getBigDecimal("weight").add(weight)); record.set("weight", record.getBigDecimal("weight").add(weight));
// BigDecimal volume = e.getVolume().multiply(BigDecimal.valueOf(e.getPayNum())); BigDecimal volume = e.getVolume().multiply(BigDecimal.valueOf(e.getPayNum()));
// record.set("volume", record.getBigDecimal("volume").add(volume)); record.set("volume", record.getBigDecimal("volume").add(volume));
// } else { } else {
// MyRecord record = new MyRecord(); MyRecord record = new MyRecord();
// record.set("totalPrice", e.getPrice().multiply(BigDecimal.valueOf(e.getPayNum()))); record.set("totalPrice", e.getPrice().multiply(BigDecimal.valueOf(e.getPayNum())));
// record.set("totalNum", e.getPayNum()); record.set("totalNum", e.getPayNum());
// record.set("tempId", e.getTempId()); record.set("tempId", e.getTempId());
// record.set("proId", proId); record.set("proId", proId);
// BigDecimal weight = e.getWeight().multiply(BigDecimal.valueOf(e.getPayNum())); BigDecimal weight = e.getWeight().multiply(BigDecimal.valueOf(e.getPayNum()));
// record.set("weight", weight); record.set("weight", weight);
// BigDecimal volume = e.getVolume().multiply(BigDecimal.valueOf(e.getPayNum())); BigDecimal volume = e.getVolume().multiply(BigDecimal.valueOf(e.getPayNum()));
// record.set("volume", volume); record.set("volume", volume);
//
// proMap.put(proId, record); proMap.put(proId, record);
// } }
// }); });
//
// // 指定包邮（单品运费模板）> 指定区域配送（单品运费模板） // 指定包邮（单品运费模板）> 指定区域配送（单品运费模板）
// int cityId = userAddress.getCityId(); int cityId = userAddress.getCityId();
//
// for (Map.Entry<Integer, MyRecord> m : proMap.entrySet()) { for (Map.Entry<Integer, MyRecord> m : proMap.entrySet()) {
// MyRecord value = m.getValue(); MyRecord value = m.getValue();
// Integer tempId = value.getInt("tempId"); Integer tempId = value.getInt("tempId");
// ShippingTemplatesDO shippingTemplatesDO = shippingTemplatesApi.getById(tempId); ShippingTemplatesDO shippingTemplatesDO = shippingTemplatesApi.getById(tempId);
// if (shippingTemplatesDO.getAppoint()) {// 指定包邮 if (shippingTemplatesDO.getAppoint()) {// 指定包邮
// // 判断是否在指定包邮区域内 // 判断是否在指定包邮区域内
// // 必须满足件数 + 金额 才能包邮 // 必须满足件数 + 金额 才能包邮
// ShippingTemplatesFreeDO shippingTemplatesFree = shippingTemplatesFreeApi.getByTempIdAndCityId(tempId, cityId); ShippingTemplatesFreeDO shippingTemplatesFree = shippingTemplatesFreeApi.getByTempIdAndCityId(tempId, cityId);
// if (ObjectUtil.isNotNull(shippingTemplatesFree)) { // 在包邮区域内 if (ObjectUtil.isNotNull(shippingTemplatesFree)) { // 在包邮区域内
// BigDecimal freeNum = shippingTemplatesFree.getNumber(); BigDecimal freeNum = shippingTemplatesFree.getNumber();
// BigDecimal multiply = value.getBigDecimal("totalPrice"); BigDecimal multiply = value.getBigDecimal("totalPrice");
// if (new BigDecimal(value.getInt("totalNum")).compareTo(freeNum) >= 0 && multiply.compareTo(shippingTemplatesFree.getPrice()) >= 0) { if (new BigDecimal(value.getInt("totalNum")).compareTo(freeNum) >= 0 && multiply.compareTo(shippingTemplatesFree.getPrice()) >= 0) {
// // 满足件数 + 金额 = 包邮 // 满足件数 + 金额 = 包邮
// continue; continue;
// } }
// } }
// } }
// // 不满足指定包邮条件，走指定区域配送 // 不满足指定包邮条件，走指定区域配送
// ShippingTemplatesRegionDO shippingTemplatesRegion = shippingTemplatesRegionApi.getByTempIdAndCityId(tempId, cityId); ShippingTemplatesRegionDO shippingTemplatesRegion = shippingTemplatesRegionApi.getByTempIdAndCityId(tempId, cityId);
// if (ObjectUtil.isNull(shippingTemplatesRegion)) { if (ObjectUtil.isNull(shippingTemplatesRegion)) {
// throw new ServiceException("计算运费时，未找到全国运费配置"); throw new ServiceException("计算运费时，未找到全国运费配置");
// } }
//
// // 判断计费方式：件数、重量、体积 // 判断计费方式：件数、重量、体积
// switch (shippingTemplatesDO.getType()) { switch (shippingTemplatesDO.getType()) {
// case 1: // 件数 case 1: // 件数
// // 判断件数是否超过首件 // 判断件数是否超过首件
// Integer num = value.getInt("totalNum"); Integer num = value.getInt("totalNum");
// if (num <= shippingTemplatesRegion.getFirst().intValue()) { if (num <= shippingTemplatesRegion.getFirst().intValue()) {
// storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()); storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice());
// } else {// 超过首件的需要计算续件 } else {// 超过首件的需要计算续件
// int renewalNum = num - shippingTemplatesRegion.getFirst().intValue(); int renewalNum = num - shippingTemplatesRegion.getFirst().intValue();
// // 剩余件数/续件 = 需要计算的续件费用的次数 // 剩余件数/续件 = 需要计算的续件费用的次数
// BigDecimal divide = new BigDecimal(renewalNum).divide(shippingTemplatesRegion.getRenewal(), 0, BigDecimal.ROUND_UP); BigDecimal divide = new BigDecimal(renewalNum).divide(shippingTemplatesRegion.getRenewal(), 0, BigDecimal.ROUND_UP);
// BigDecimal renewalPrice = shippingTemplatesRegion.getRenewalPrice().multiply(divide); BigDecimal renewalPrice = shippingTemplatesRegion.getRenewalPrice().multiply(divide);
// storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()).add(renewalPrice); storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()).add(renewalPrice);
// } }
// break; break;
// case 2: // 重量 case 2: // 重量
// BigDecimal weight = value.getBigDecimal("weight"); BigDecimal weight = value.getBigDecimal("weight");
// if (weight.compareTo(shippingTemplatesRegion.getFirst()) <= 0) { if (weight.compareTo(shippingTemplatesRegion.getFirst()) <= 0) {
// storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()); storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice());
// } else {// 超过首件的需要计算续件 } else {// 超过首件的需要计算续件
// BigDecimal renewalNum = weight.subtract(shippingTemplatesRegion.getFirst()); BigDecimal renewalNum = weight.subtract(shippingTemplatesRegion.getFirst());
// // 剩余件数/续件 = 需要计算的续件费用的次数 // 剩余件数/续件 = 需要计算的续件费用的次数
// BigDecimal divide = renewalNum.divide(shippingTemplatesRegion.getRenewal(), 0, BigDecimal.ROUND_UP); BigDecimal divide = renewalNum.divide(shippingTemplatesRegion.getRenewal(), 0, BigDecimal.ROUND_UP);
// BigDecimal renewalPrice = shippingTemplatesRegion.getRenewalPrice().multiply(divide); BigDecimal renewalPrice = shippingTemplatesRegion.getRenewalPrice().multiply(divide);
// storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()).add(renewalPrice); storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()).add(renewalPrice);
// } }
// break; break;
// case 3: // 体积 case 3: // 体积
// BigDecimal volume = value.getBigDecimal("volume"); BigDecimal volume = value.getBigDecimal("volume");
// if (volume.compareTo(shippingTemplatesRegion.getFirst()) <= 0) { if (volume.compareTo(shippingTemplatesRegion.getFirst()) <= 0) {
// storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()); storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice());
// } else {// 超过首件的需要计算续件 } else {// 超过首件的需要计算续件
// BigDecimal renewalNum = volume.subtract(shippingTemplatesRegion.getFirst()); BigDecimal renewalNum = volume.subtract(shippingTemplatesRegion.getFirst());
// // 剩余件数/续件 = 需要计算的续件费用的次数 // 剩余件数/续件 = 需要计算的续件费用的次数
// BigDecimal divide = renewalNum.divide(shippingTemplatesRegion.getRenewal(), 0, BigDecimal.ROUND_UP); BigDecimal divide = renewalNum.divide(shippingTemplatesRegion.getRenewal(), 0, BigDecimal.ROUND_UP);
// BigDecimal renewalPrice = shippingTemplatesRegion.getRenewalPrice().multiply(divide); BigDecimal renewalPrice = shippingTemplatesRegion.getRenewalPrice().multiply(divide);
// storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()).add(renewalPrice); storePostage = storePostage.add(shippingTemplatesRegion.getFirstPrice()).add(renewalPrice);
// } }
// break; break;
// } }
// } }
// } }
// orderInfoVo.setFreightFee(storePostage); orderInfoVo.setFreightFee(storePostage);
} }
/** /**
@ -740,22 +751,22 @@ public class OrderServiceImpl implements OrderService {
int orderProNum = orderInfoVo.getOrderDetailList().stream().mapToInt(OrderInfoDetailVo::getPayNum).sum(); int orderProNum = orderInfoVo.getOrderDetailList().stream().mapToInt(OrderInfoDetailVo::getPayNum).sum();
orderInfoVo.setOrderProNum(orderProNum); orderInfoVo.setOrderProNum(orderProNum);
// 获取默认地址 // 获取默认地址
AddressRespDTO userAddress = addressApi.getDefaultByUid(user.getId()); UserAddressRespDTO userAddress = userAddressApi.getDefaultByUid(user.getId());
if (ObjectUtil.isNotNull(userAddress)) { if (ObjectUtil.isNotNull(userAddress)) {
// 计算运费 // 计算运费
getFreightFee(orderInfoVo, userAddress); getFreightFee(orderInfoVo, userAddress);
orderInfoVo.setAddressId(userAddress.getId()); orderInfoVo.setAddressId(userAddress.getId());
orderInfoVo.setRealName(userAddress.getName()); orderInfoVo.setRealName(userAddress.getRealName());
orderInfoVo.setPhone(userAddress.getMobile()); orderInfoVo.setPhone(userAddress.getPhone());
orderInfoVo.setProvince(userAddress.getProvince()); orderInfoVo.setProvince(userAddress.getProvince());
orderInfoVo.setCity(userAddress.getCity()); orderInfoVo.setCity(userAddress.getCity());
orderInfoVo.setDistrict(userAddress.getDistrict()); orderInfoVo.setDistrict(userAddress.getDistrict());
orderInfoVo.setDetail(userAddress.getDetailAddress()); orderInfoVo.setDetail(userAddress.getDetail());
} else { } else {
orderInfoVo.setFreightFee(BigDecimal.ZERO); orderInfoVo.setFreightFee(BigDecimal.ZERO);
} }
// 实际支付金额 // 实际支付金额
orderInfoVo.setPayFee(orderInfoVo.getProTotalFee().add(orderInfoVo.getFreightFee())); orderInfoVo.setPayFee(orderInfoVo.getProTotalFee().add(BigDecimal.ZERO));
//用户剩余积分 //用户剩余积分
//用户剩余经验 //用户剩余经验
// 缓存订单 // 缓存订单
@ -1033,7 +1044,7 @@ public class OrderServiceImpl implements OrderService {
// 快递配送，无地址 // 快递配送，无地址
priceResponse.setFreightFee(BigDecimal.ZERO); priceResponse.setFreightFee(BigDecimal.ZERO);
} else {// 快递配送，有地址 } else {// 快递配送，有地址
AddressRespDTO userAddress = addressApi.getById(request.getAddressId()); UserAddressRespDTO userAddress = userAddressApi.getById(request.getAddressId());
if (ObjectUtil.isNull(userAddress)) { if (ObjectUtil.isNull(userAddress)) {
priceResponse.setFreightFee(BigDecimal.ZERO); priceResponse.setFreightFee(BigDecimal.ZERO);
} else { } else {
@ -1041,7 +1052,7 @@ public class OrderServiceImpl implements OrderService {
priceResponse.setFreightFee(orderInfoVo.getFreightFee()); priceResponse.setFreightFee(orderInfoVo.getFreightFee());
} }
} }
// 计算优惠券金额 // 计算优惠券金额 现在不开启优惠卷功能
// if (orderInfoVo.getProTotalFee().compareTo(storeCouponUser.getMoney()) <= 0) { // if (orderInfoVo.getProTotalFee().compareTo(storeCouponUser.getMoney()) <= 0) {
// priceResponse.setCouponFee(orderInfoVo.getProTotalFee()); // priceResponse.setCouponFee(orderInfoVo.getProTotalFee());
@ -1056,6 +1067,7 @@ public class OrderServiceImpl implements OrderService {
// priceResponse.setCouponFee(storeCouponUser.getMoney()); // priceResponse.setCouponFee(storeCouponUser.getMoney());
// } // }
priceResponse.setProTotalFee(orderInfoVo.getProTotalFee());
// 积分部分 // 积分部分
// 使用积分 // 使用积分
@ -1118,13 +1130,13 @@ public class OrderServiceImpl implements OrderService {
String userAddressStr = ""; String userAddressStr = "";
if (orderRequest.getShippingType() == 1) { // 快递配送 if (orderRequest.getShippingType() == 1) { // 快递配送
if (orderRequest.getAddressId() <= 0) throw new ServiceException("请选择收货地址"); if (orderRequest.getAddressId() <= 0) throw new ServiceException("请选择收货地址");
AddressRespDTO userAddress = addressApi.getById(orderRequest.getAddressId()); UserAddressRespDTO userAddress = userAddressApi.getById(orderRequest.getAddressId());
if (ObjectUtil.isNull(userAddress) || userAddress.getDeleted()) { if (ObjectUtil.isNull(userAddress)) {
throw new ServiceException("收货地址有误"); throw new ServiceException("收货地址有误");
} }
orderRequest.setRealName(userAddress.getName()); orderRequest.setRealName(userAddress.getRealName());
orderRequest.setPhone(userAddress.getMobile()); orderRequest.setPhone(userAddress.getPhone());
userAddressStr = userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getDetailAddress(); userAddressStr = userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getDetail();
}else if (orderRequest.getShippingType() == 2) { // 到店自提 }else if (orderRequest.getShippingType() == 2) { // 到店自提
if (StringUtils.isBlank(orderRequest.getRealName()) || StringUtils.isBlank(orderRequest.getPhone())) { if (StringUtils.isBlank(orderRequest.getRealName()) || StringUtils.isBlank(orderRequest.getPhone())) {
throw new ServiceException("请填写姓名和电话"); throw new ServiceException("请填写姓名和电话");
@ -1249,7 +1261,7 @@ public class OrderServiceImpl implements OrderService {
storeOrder.setStoreId(orderRequest.getStoreId()); storeOrder.setStoreId(orderRequest.getStoreId());
} }
storeOrder.setTotalNum(orderInfoVo.getOrderProNum()); storeOrder.setTotalNum(orderInfoVo.getOrderProNum());
storeOrder.setCouponId(Optional.ofNullable(orderRequest.getCouponId()).orElse(0)); storeOrder.setCouponId(Optional.ofNullable(orderRequest.getCouponId()).orElse(0L));
// 订单总价 // 订单总价
BigDecimal totalPrice = computedOrderPriceResponse.getProTotalFee().add(computedOrderPriceResponse.getFreightFee()); BigDecimal totalPrice = computedOrderPriceResponse.getProTotalFee().add(computedOrderPriceResponse.getFreightFee());

39
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
View File

@ -62,14 +62,16 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
RechargeOrderDO updateObj = RechargeOrderConvert.INSTANCE.convert(updateReqVO); RechargeOrderDO updateObj = RechargeOrderConvert.INSTANCE.convert(updateReqVO);
rechargeOrderMapper.updateById(updateObj); rechargeOrderMapper.updateById(updateObj);
} }
@Override @Override
public void updateRechargeOrderStatus(RechargeOrderUpdateReqVO updateReqVO) { public void updateRechargeOrderStatus(RechargeOrderUpdateReqVO updateReqVO) {
// 校验存在 // 校验存在
validateRechargeOrderExists(updateReqVO.getId()); validateRechargeOrderExists(updateReqVO.getId());
// 更新 // 更新
RechargeOrderDO updateObj = RechargeOrderConvert.INSTANCE.convert(updateReqVO); RechargeOrderDO updateObj = RechargeOrderConvert.INSTANCE.convert(updateReqVO);
rechargeOrderMapper.updateById(updateObj); rechargeOrderMapper.updateById(updateObj);
} }
@Override @Override
public void deleteRechargeOrder(Long id) { public void deleteRechargeOrder(Long id) {
// 校验存在 // 校验存在
@ -97,7 +99,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
@Override @Override
public PageResult<RechargeOrderRespVO> getRechargeOrderPage(RechargeOrderPageReqVO pageReqVO) { public PageResult<RechargeOrderRespVO> getRechargeOrderPage(RechargeOrderPageReqVO pageReqVO) {
Page<RechargeOrderRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); Page<RechargeOrderRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
rechargeOrderMapper.findListPage(page,pageReqVO); rechargeOrderMapper.findListPage(page, pageReqVO);
return new PageResult<>(page.getRecords(), page.getTotal()); return new PageResult<>(page.getRecords(), page.getTotal());
} }
@ -148,23 +150,22 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
public MemberHeadResponse memberHeadInfo() { public MemberHeadResponse memberHeadInfo() {
MemberHeadResponse response = new MemberHeadResponse(); MemberHeadResponse response = new MemberHeadResponse();
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
if(loginUser!=null){ Assert.notNull(loginUser, "登录失效,请重新登录!");
List<RechargeOrderDO> orderDOS = rechargeOrderMapper.selectList(Wrappers.<RechargeOrderDO>lambdaQuery().eq(RechargeOrderDO::getUid, loginUser.getId())); List<RechargeOrderDO> orderDOS = rechargeOrderMapper.selectList(Wrappers.<RechargeOrderDO>lambdaQuery().eq(RechargeOrderDO::getUid, loginUser.getId()).eq(RechargeOrderDO::getPaid, 1));
if (!CollectionUtils.isEmpty(orderDOS)) { if (!CollectionUtils.isEmpty(orderDOS)) {
BigDecimal amount = new BigDecimal("0"); BigDecimal amount = new BigDecimal("0");
for (RechargeOrderDO orderDO : orderDOS) { for (RechargeOrderDO orderDO : orderDOS) {
amount = amount.add(orderDO.getPayPrice()); amount = amount.add(orderDO.getPayPrice());
} }
if (amount.compareTo(new BigDecimal("640")) < 0) { if (amount.compareTo(new BigDecimal("640")) < 0) {
response.setGrade("普通会员"); response.setGrade("普通会员");
response.setIntegral(amount.stripTrailingZeros().toPlainString() + "/" + "640"); response.setIntegral(amount.stripTrailingZeros().toPlainString() + "/" + "640");
} else if (amount.compareTo(new BigDecimal("640")) >= 0) { } else if (amount.compareTo(new BigDecimal("1040")) >= 0) {
response.setGrade("高级会员"); response.setGrade("高级会员");
response.setIntegral(amount.stripTrailingZeros().toPlainString() + "/" + "1040"); response.setIntegral(amount.stripTrailingZeros().toPlainString() + "/" + "1040");
} else { } else {
response.setGrade("中级会员"); response.setGrade("中级会员");
response.setIntegral(amount.stripTrailingZeros().toPlainString() + "/" + "1040"); response.setIntegral(amount.stripTrailingZeros().toPlainString() + "/" + "1040");
}
} }
} }
return response; return response;

6
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/utils/OrderUtil.java
View File

@ -106,13 +106,13 @@ public class OrderUtil {
payType = payType.toLowerCase(); payType = payType.toLowerCase();
switch (payType){ switch (payType){
case PayConstants.PAY_TYPE_WE_CHAT: case PayConstants.PAY_TYPE_WE_CHAT:
result = apiConfigApi.getConfigKey(SysConfigConstants.CONFIG_PAY_WEIXIN_OPEN).equals("1"); result = apiConfigApi.getConfigKeyValue(SysConfigConstants.CONFIG_PAY_WEIXIN_OPEN).equals("1");
break; break;
case PayConstants.PAY_TYPE_YUE: case PayConstants.PAY_TYPE_YUE:
result = (apiConfigApi.getConfigKey(SysConfigConstants.CONFIG_YUE_PAY_STATUS).equals("1")); result = (apiConfigApi.getConfigKeyValue(SysConfigConstants.CONFIG_YUE_PAY_STATUS).equals("1"));
break; break;
case PayConstants.PAY_TYPE_ALI_PAY: case PayConstants.PAY_TYPE_ALI_PAY:
result = (apiConfigApi.getConfigKey(SysConfigConstants.CONFIG_ALI_PAY_STATUS).equals("1")); result = (apiConfigApi.getConfigKeyValue(SysConfigConstants.CONFIG_ALI_PAY_STATUS).equals("1"));
break; break;
} }
return result; return result;

2
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml
View File

@ -3,6 +3,6 @@
<mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesFreeMapper"> <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesFreeMapper">
<select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesFreeRespVO" parameterType="integer"> <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesFreeRespVO" parameterType="integer">
SELECT group_concat(`city_id`) AS city_id, province_id, `number`, price FROM eb_shipping_templates_free where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `id` ORDER BY id ASC SELECT group_concat(`city_id`) AS city_id, province_id, `number`, price, uniqid FROM eb_shipping_templates_free where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
</select> </select>
</mapper> </mapper>

2
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml
View File

@ -3,6 +3,6 @@
<mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesNoDeliveryMapper"> <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesNoDeliveryMapper">
<select id="getList" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesNoDeliveryRespVO" parameterType="integer"> <select id="getList" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesNoDeliveryRespVO" parameterType="integer">
SELECT group_concat(`city_id`) AS city_id, province_id FROM eb_shipping_templates_no_delivery WHERE temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `id` ORDER BY id ASC SELECT group_concat(`city_id`) AS city_id, province_id, uniqid FROM eb_shipping_templates_no_delivery WHERE temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
</select> </select>
</mapper> </mapper>

2
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml
View File

@ -3,6 +3,6 @@
<mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesRegionMapper"> <mapper namespace="cn.iocoder.yudao.module.shop.dal.mysql.express.ShippingTemplatesRegionMapper">
<select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesRegionRespVO" parameterType="integer"> <select id="getListGroup" resultType="cn.iocoder.yudao.module.shop.controller.admin.express.vo.ShippingTemplatesRegionRespVO" parameterType="integer">
SELECT group_concat(`city_id`) AS city_id, `first`, first_price, `renewal`, renewal_price FROM eb_shipping_templates_region where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `id` ORDER BY id ASC SELECT group_concat(`city_id`) AS city_id, province_id, `first`, first_price, `renewal`, renewal_price, uniqid FROM eb_shipping_templates_region where temp_id = #{tempId, jdbcType=INTEGER} GROUP BY `uniqid`,id ORDER BY id ASC
</select> </select>
</mapper> </mapper>

2
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/AddressApi.java
View File

@ -19,7 +19,7 @@ public interface AddressApi {
AddressRespDTO getAddress(Long id, Long userId); AddressRespDTO getAddress(Long id, Long userId);
AddressRespDTO getById(Integer addressId); AddressRespDTO getById(Long addressId);
/** /**
* 获取默认地址 * 获取默认地址

21
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/UserAddressApi.java Normal file
View File

@ -0,0 +1,21 @@
package cn.iocoder.yudao.module.member.api.address;
import cn.iocoder.yudao.module.member.api.address.dto.UserAddressRespDTO;
/**
* @Title:UserAddressApi
* @Description: TODO
* @author: tangqian
* @date: 2023/5/24 14:39
* @version: V1.0.0
*/
public interface UserAddressApi {
UserAddressRespDTO getById(Long addressId);
/**
* 获取默认地址
* @return UserAddress
*/
UserAddressRespDTO getDefaultByUid(Long uid);
}

41
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/dto/UserAddressRespDTO.java Normal file
View File

@ -0,0 +1,41 @@
package cn.iocoder.yudao.module.member.api.address.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
/**
* @Title:UserAddressRespDTO
* @Description: TODO
* @author: tangqian
* @date: 2023/5/24 14:46
* @version: V1.0.0
*/
@Data
public class UserAddressRespDTO {
private Long id;
private Long userId;
private String realName;
private String phone;
private String province;
private String city;
private Integer cityId;
private String district;
private String detail;
private Integer postCode;
private String longitude;
private String latitude;
private Boolean isDefault;
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/address/AddressApiImpl.java
View File

@ -36,7 +36,7 @@ public class AddressApiImpl implements AddressApi {
} }
@Override @Override
public AddressRespDTO getById(Integer addressId) { public AddressRespDTO getById(Long addressId) {
LambdaQueryWrapper<AddressDO> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<AddressDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(AddressDO::getId, addressId); lambdaQueryWrapper.eq(AddressDO::getId, addressId);
return AddressConvert.INSTANCE.convert02(addressMapper.selectOne(lambdaQueryWrapper)); return AddressConvert.INSTANCE.convert02(addressMapper.selectOne(lambdaQueryWrapper));

50
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/address/UserAddressApiImpl.java Normal file
View File

@ -0,0 +1,50 @@
package cn.iocoder.yudao.module.member.api.address;
import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
import cn.iocoder.yudao.module.member.api.address.dto.UserAddressRespDTO;
import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO;
import cn.iocoder.yudao.module.member.dal.dataobject.address.UserAddress;
import cn.iocoder.yudao.module.member.dal.mysql.address.UserAddressMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
/**
* @Title:UserAddressApiImpl
* @Description: TODO
* @author: tangqian
* @date: 2023/5/24 14:40
* @version: V1.0.0
*/
@Service
@Validated
public class UserAddressApiImpl implements UserAddressApi{
@Autowired
private UserAddressMapper addressMapper;
@Override
public UserAddressRespDTO getById(Long addressId) {
UserAddressRespDTO respDTO = new UserAddressRespDTO();
LambdaQueryWrapper<UserAddress> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(UserAddress::getId, addressId);
UserAddress userAddress = addressMapper.selectOne(lambdaQueryWrapper);
BeanUtils.copyProperties(userAddress,respDTO);
return respDTO;
}
@Override
public UserAddressRespDTO getDefaultByUid(Long uid) {
UserAddressRespDTO respDTO = new UserAddressRespDTO();
LambdaQueryWrapper<UserAddress> lambdaQueryWrapper = Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(UserAddress::getIsDefault, true);
lambdaQueryWrapper.eq(UserAddress::getUserId, uid);
UserAddress userAddress = addressMapper.selectOne(lambdaQueryWrapper);
if (null != userAddress) {
BeanUtils.copyProperties(userAddress,respDTO);
}
return respDTO;
}
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApiImpl.java
View File

@ -134,7 +134,7 @@ public class MemberUserApiImpl implements MemberUserApi {
throw new ServiceException("用户信息不存在！"); throw new ServiceException("用户信息不存在！");
} }
if (user.getStatus() == 0) { if (user.getStatus() == 1) {
throw new ServiceException("用户已经被禁用！"); throw new ServiceException("用户已经被禁用！");
} }
return user; return user;

2
yudao-ui-admin/.env.dev
View File

@ -6,7 +6,7 @@ VUE_APP_TITLE = 创盈商户管理系统
# 芋道管理系统/开发环境 # 芋道管理系统/开发环境
#VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/cyywl-api' #VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/cyywl-api'
VUE_APP_BASE_API = 'http://192.168.1.188:48080' VUE_APP_BASE_API = 'http://api.cyywl.top'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

4
yudao-ui-admin/src/views/mall/product/store/creatStore/index.vue
View File

@ -355,7 +355,7 @@ const defaultObj = {
isGood: false, isGood: false,
isHot: false, isHot: false,
isBest: false, isBest: false,
tempId: '111', tempId: '',
attrValue: [{ attrValue: [{
image: '', image: '',
price: 0, price: 0,
@ -819,7 +819,7 @@ export default {
// 运费模板； // 运费模板；
getShippingList() { getShippingList() {
shippingTemplatesList(this.tempData).then(res => { shippingTemplatesList(this.tempData).then(res => {
this.shippingList = res.list this.shippingList = res.data.list
}) })
}, },
showInput(item) { showInput(item) {

2
yudao-ui-admin/src/views/mall/product/store/index.vue
View File

@ -59,13 +59,11 @@
/> />
<el-table-column label="商品图" min-width="80"> <el-table-column label="商品图" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="demo-image__preview">
<el-image <el-image
style="width: 36px; height: 36px" style="width: 36px; height: 36px"
:src="scope.row.image" :src="scope.row.image"
:preview-src-list="[scope.row.image]" :preview-src-list="[scope.row.image]"
/> />
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商品名称" <el-table-column label="商品名称"

8
yudao-ui-app/config/app.js
View File

@ -1,14 +1,14 @@
// let domain = 'http://yuxy.perrymake.com' let domain = 'http://api.cyywl.top'
let domain = 'http://192.168.1.188:48080' // let domain = 'http://192.168.1.188:48080'
module.exports = { module.exports = {
// 请求域名 格式： https://您的域名 // 请求域名 格式： https://您的域名
// #ifdef MP // #ifdef MP
HTTP_REQUEST_URL: domain, HTTP_REQUEST_URL: domain,
// #endif // #endif
// HTTP_ADMIN_URL:'http://yuxy.perrymake.com', //PC后台的API请求地址，上传图片用 HTTP_ADMIN_URL:'http://api.cyywl.top', //PC后台的API请求地址，上传图片用
HTTP_ADMIN_URL:'http://192.168.1.188:48080', //PC后台的API请求地址，上传图片用 // HTTP_ADMIN_URL:'http://192.168.1.188:48080', //PC后台的API请求地址，上传图片用
// #ifdef H5 // #ifdef H5
//H5接口是浏览器地址 //H5接口是浏览器地址
// HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host, // HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host,

543
yudao-ui-app/package-lock.json generated
View File

@ -1,9 +1,353 @@
{ {
"name": "yudao-ui-app", "name": "yudao-ui-app",
"version": "1.0.0", "version": "1.0.0",
"lockfileVersion": 1, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": {
"": {
"name": "yudao-ui-app",
"version": "1.0.0",
"license": "ISC",
"dependencies": {
"clipboard": "^2.0.11",
"html-to-image": "^1.11.11",
"qrcode": "^1.5.3"
}
},
"node_modules/ansi-regex": {
"version": "5.0.1",
"resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"engines": {
"node": ">=8"
}
},
"node_modules/ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dependencies": {
"color-convert": "^2.0.1"
},
"engines": {
"node": ">=8"
}
},
"node_modules/camelcase": {
"version": "5.3.1",
"resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
"engines": {
"node": ">=6"
}
},
"node_modules/clipboard": {
"version": "2.0.11",
"resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
"dependencies": {
"good-listener": "^1.2.2",
"select": "^1.1.2",
"tiny-emitter": "^2.0.0"
}
},
"node_modules/cliui": {
"version": "6.0.0",
"resolved": "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz",
"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
"dependencies": {
"string-width": "^4.2.0",
"strip-ansi": "^6.0.0",
"wrap-ansi": "^6.2.0"
}
},
"node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dependencies": {
"color-name": "~1.1.4"
},
"engines": {
"node": ">=7.0.0"
}
},
"node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/decamelize": {
"version": "1.2.0",
"resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/delegate": {
"version": "3.2.0",
"resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
},
"node_modules/dijkstrajs": {
"version": "1.0.3",
"resolved": "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
"integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
},
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
},
"node_modules/encode-utf8": {
"version": "1.0.3",
"resolved": "https://registry.npmmirror.com/encode-utf8/-/encode-utf8-1.0.3.tgz",
"integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
},
"node_modules/find-up": {
"version": "4.1.0",
"resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
"dependencies": {
"locate-path": "^5.0.0",
"path-exists": "^4.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz",
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
"engines": {
"node": "6.* || 8.* || >= 10.*"
}
},
"node_modules/good-listener": {
"version": "1.2.2",
"resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
"integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
"dependencies": {
"delegate": "^3.1.2"
}
},
"node_modules/html-to-image": {
"version": "1.11.11",
"resolved": "https://registry.npmmirror.com/html-to-image/-/html-to-image-1.11.11.tgz",
"integrity": "sha512-9gux8QhvjRO/erSnDPv28noDZcPZmYE7e1vFsBLKLlRlKDSqNJYebj6Qz1TGd5lsRV+X+xYyjCKjuZdABinWjA=="
},
"node_modules/is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"engines": {
"node": ">=8"
}
},
"node_modules/locate-path": {
"version": "5.0.0",
"resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
"dependencies": {
"p-locate": "^4.1.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/p-limit": {
"version": "2.3.0",
"resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dependencies": {
"p-try": "^2.0.0"
},
"engines": {
"node": ">=6"
}
},
"node_modules/p-locate": {
"version": "4.1.0",
"resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
"dependencies": {
"p-limit": "^2.2.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/p-try": {
"version": "2.2.0",
"resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz",
"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
"engines": {
"node": ">=6"
}
},
"node_modules/path-exists": {
"version": "4.0.0",
"resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
"engines": {
"node": ">=8"
}
},
"node_modules/pngjs": {
"version": "5.0.0",
"resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz",
"integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
"engines": {
"node": ">=10.13.0"
}
},
"node_modules/qrcode": {
"version": "1.5.3",
"resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.3.tgz",
"integrity": "sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==",
"dependencies": {
"dijkstrajs": "^1.0.1",
"encode-utf8": "^1.0.3",
"pngjs": "^5.0.0",
"yargs": "^15.3.1"
},
"bin": {
"qrcode": "bin/qrcode"
},
"engines": {
"node": ">=10.13.0"
}
},
"node_modules/require-directory": {
"version": "2.1.1",
"resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/require-main-filename": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz",
"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
},
"node_modules/select": {
"version": "1.1.2",
"resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
"integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
},
"node_modules/set-blocking": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
},
"node_modules/string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"dependencies": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
"strip-ansi": "^6.0.1"
},
"engines": {
"node": ">=8"
}
},
"node_modules/strip-ansi": {
"version": "6.0.1",
"resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"dependencies": {
"ansi-regex": "^5.0.1"
},
"engines": {
"node": ">=8"
}
},
"node_modules/tiny-emitter": {
"version": "2.1.0",
"resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
},
"node_modules/which-module": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz",
"integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
},
"node_modules/wrap-ansi": {
"version": "6.2.0",
"resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
"dependencies": {
"ansi-styles": "^4.0.0",
"string-width": "^4.1.0",
"strip-ansi": "^6.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/y18n": {
"version": "4.0.3",
"resolved": "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz",
"integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
},
"node_modules/yargs": {
"version": "15.4.1",
"resolved": "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz",
"integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
"dependencies": {
"cliui": "^6.0.0",
"decamelize": "^1.2.0",
"find-up": "^4.1.0",
"get-caller-file": "^2.0.1",
"require-directory": "^2.1.1",
"require-main-filename": "^2.0.0",
"set-blocking": "^2.0.0",
"string-width": "^4.2.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
"yargs-parser": "^18.1.2"
},
"engines": {
"node": ">=8"
}
},
"node_modules/yargs-parser": {
"version": "18.1.3",
"resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz",
"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
"dependencies": {
"camelcase": "^5.0.0",
"decamelize": "^1.2.0"
},
"engines": {
"node": ">=6"
}
}
},
"dependencies": { "dependencies": {
"ansi-regex": {
"version": "5.0.1",
"resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
},
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"requires": {
"color-convert": "^2.0.1"
}
},
"camelcase": {
"version": "5.3.1",
"resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
},
"clipboard": { "clipboard": {
"version": "2.0.11", "version": "2.0.11",
"resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz", "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
@ -14,11 +358,68 @@
"tiny-emitter": "^2.0.0" "tiny-emitter": "^2.0.0"
} }
}, },
"cliui": {
"version": "6.0.0",
"resolved": "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz",
"integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
"requires": {
"string-width": "^4.2.0",
"strip-ansi": "^6.0.0",
"wrap-ansi": "^6.2.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"decamelize": {
"version": "1.2.0",
"resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
},
"delegate": { "delegate": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz", "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
}, },
"dijkstrajs": {
"version": "1.0.3",
"resolved": "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
"integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
},
"emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
},
"encode-utf8": {
"version": "1.0.3",
"resolved": "https://registry.npmmirror.com/encode-utf8/-/encode-utf8-1.0.3.tgz",
"integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
},
"find-up": {
"version": "4.1.0",
"resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
"requires": {
"locate-path": "^5.0.0",
"path-exists": "^4.0.0"
}
},
"get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz",
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
},
"good-listener": { "good-listener": {
"version": "1.2.2", "version": "1.2.2",
"resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz", "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
@ -27,15 +428,155 @@
"delegate": "^3.1.2" "delegate": "^3.1.2"
} }
}, },
"html-to-image": {
"version": "1.11.11",
"resolved": "https://registry.npmmirror.com/html-to-image/-/html-to-image-1.11.11.tgz",
"integrity": "sha512-9gux8QhvjRO/erSnDPv28noDZcPZmYE7e1vFsBLKLlRlKDSqNJYebj6Qz1TGd5lsRV+X+xYyjCKjuZdABinWjA=="
},
"is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
},
"locate-path": {
"version": "5.0.0",
"resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
"requires": {
"p-locate": "^4.1.0"
}
},
"p-limit": {
"version": "2.3.0",
"resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"requires": {
"p-try": "^2.0.0"
}
},
"p-locate": {
"version": "4.1.0",
"resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
"requires": {
"p-limit": "^2.2.0"
}
},
"p-try": {
"version": "2.2.0",
"resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz",
"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
},
"path-exists": {
"version": "4.0.0",
"resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
},
"pngjs": {
"version": "5.0.0",
"resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz",
"integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="
},
"qrcode": {
"version": "1.5.3",
"resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.3.tgz",
"integrity": "sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==",
"requires": {
"dijkstrajs": "^1.0.1",
"encode-utf8": "^1.0.3",
"pngjs": "^5.0.0",
"yargs": "^15.3.1"
}
},
"require-directory": {
"version": "2.1.1",
"resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
},
"require-main-filename": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz",
"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
},
"select": { "select": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz", "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
"integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
}, },
"set-blocking": {
"version": "2.0.0",
"resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
},
"string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
"requires": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
"strip-ansi": "^6.0.1"
}
},
"strip-ansi": {
"version": "6.0.1",
"resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
"requires": {
"ansi-regex": "^5.0.1"
}
},
"tiny-emitter": { "tiny-emitter": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz", "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
},
"which-module": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz",
"integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
},
"wrap-ansi": {
"version": "6.2.0",
"resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
"requires": {
"ansi-styles": "^4.0.0",
"string-width": "^4.1.0",
"strip-ansi": "^6.0.0"
}
},
"y18n": {
"version": "4.0.3",
"resolved": "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz",
"integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
},
"yargs": {
"version": "15.4.1",
"resolved": "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz",
"integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
"requires": {
"cliui": "^6.0.0",
"decamelize": "^1.2.0",
"find-up": "^4.1.0",
"get-caller-file": "^2.0.1",
"require-directory": "^2.1.1",
"require-main-filename": "^2.0.0",
"set-blocking": "^2.0.0",
"string-width": "^4.2.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
"yargs-parser": "^18.1.2"
}
},
"yargs-parser": {
"version": "18.1.3",
"resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz",
"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
"requires": {
"camelcase": "^5.0.0",
"decamelize": "^1.2.0"
}
} }
} }
} }

4
yudao-ui-app/package.json
View File

@ -10,6 +10,8 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"clipboard": "^2.0.11" "clipboard": "^2.0.11",
"html-to-image": "^1.11.11",
"qrcode": "^1.5.3"
} }
} }

13
yudao-ui-app/pages/goods_cashier/index.vue
View File

@ -251,22 +251,9 @@
if (!that.orderId) return that.$util.Tips({ if (!that.orderId) return that.$util.Tips({
title: '请选择要支付的订单' title: '请选择要支付的订单'
}); });
if (paytype == 'yue' && parseFloat(number) < parseFloat(that.payPriceShow)) return that.$util.Tips({
title: `余额不足`
});
uni.showLoading({ uni.showLoading({
title: `支付中` title: `支付中`
}); });
if (paytype == 'friend' && that.orderId) {
uni.hideLoading();
return uni.navigateTo({
url: '/pages/users/payment_on_behalf/index?order_id=' + that.orderId + '&spread=' +
this.$store.state.app.uid,
success: res => {},
fail: () => {},
complete: () => {}
});
}
orderPay({ orderPay({
uni: that.orderId, uni: that.orderId,
paytype: paytype, paytype: paytype,

6
yudao-ui-app/pages/user/index.vue
View File

@ -92,7 +92,7 @@
<u-icon slot="icon" size="45" name="/static/images/user_icon1.png"></u-icon> <u-icon slot="icon" size="45" name="/static/images/user_icon1.png"></u-icon>
</u-cell> </u-cell>
<u-cell title="分销中心" v-if="userInfo.userType === 'PROMOTER'" isLink <u-cell title="分销中心" v-if="userInfo.userType === 'PROMOTER'" isLink
@click="jumpPage('/pages/users/user_spread_user/index')"> @click="jumpPage('/pages/users/user_spread_code/index')">
<u-icon slot="icon" size="45" name="/static/images/user_icon2.png"></u-icon> <u-icon slot="icon" size="45" name="/static/images/user_icon2.png"></u-icon>
</u-cell> </u-cell>
<u-cell title="热线电话" value="023-12948338" :value="tenantInfo.serviceMobile" isLink> <u-cell title="热线电话" value="023-12948338" :value="tenantInfo.serviceMobile" isLink>
@ -255,8 +255,8 @@
}) })
}, },
kefuClick() { kefuClick() {
if (tenantInfo.wxKfUrl) { if (this.tenantInfo.wxKfUrl) {
location.href = tenantInfo.wxKfUrl location.href = this.tenantInfo.wxKfUrl
} }
}, },
getOrderData() { getOrderData() {

554
yudao-ui-app/pages/users/user_spread_code/index.vue
View File

@ -1,430 +1,222 @@
<template> <template>
<view style="height: 100%;"> <view class="main-page">
<view class='distribution-posters'> <image :src="posterUrl" style="width:100%;height:100%;" mode="scaleToFill" v-show="posterUrl"></image>
<swiper :indicator-dots="indicatorDots" :autoplay="autoplay" :circular="circular" :interval="interval" <view class="spread-wrap" id="poster-wrap" v-show="!posterUrl">
:duration="duration" @change="bindchange" previous-margin="40px" next-margin="40px"> <view class="logo-wrap">
<block v-for="(item,index) in spreadList" :key="index"> <image :src="tenantInfo.logo" class="logo-image"></image>
<swiper-item> </view>
<image :src="item.pic" class="slide-image" :class="swiperIndex == index ? 'active' : 'quiet'" <view class="activity-wrap" v-show="activityList.length > 0">
mode='aspectFill' /> <view class="item-wrap" :key="index" v-for="(item, index) in activityList">
</swiper-item> <view class="text">办理会员{{item.gearAmount}}元</view>
</block> <view class="text">可享一年返回<span>{{item.refundAmount}}元</span>话费</view>
</swiper> </view>
<!-- #ifdef MP --> <view class="tips">
<view class='keep bg-color' @click='savePosterPath'>保存海报</view> 三个活动可同时参与，每个手机号仅限一次，最高可反1920元话费！！！
<!-- #endif --> </view>
<!-- #ifndef MP --> <view class="service-phone">{{tenantInfo.serviceMobile}}</view>
<div class="preserve acea-row row-center-wrapper"> <view class="tenant-info-wrap">
<div class="line"></div> <view class="info-wrap">
<div class="tip">长按保存图片</div> <view class="info">
<div class="line"></div> <view class="name">{{userInfo.nickname}}</view>
</div> <view class="phone">{{userInfo.mobile}}</view>
<!-- #endif --> <view class="address">
</view> {{userInfo.parentDeptName}}
<!-- #ifdef MP --> </view>
<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> --> </view>
<!-- #endif --> <view class="qrcode-wrap">
<view class="canvas" v-if="canvasStatus"> <canvas id="qrcode" style="width:132rpx;height:132rpx;"></canvas>
<canvas style="width:750px;height:1190px;" canvas-id="canvasOne"></canvas> </view>
<canvas canvas-id="qrcode" :style="{width: `${qrcodeSize}px`, height: `${qrcodeSize}px`}" /> </view>
<u-button class="logon" @click="downImage" v-show="!isHideBtn">生成海报</u-button>
</view>
</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
// #ifdef H5
import uQRCode from '@/js_sdk/Sansnn-uQRCode/uqrcode.js'
// #endif
import {
getUserInfo,
spreadBanner
} from '@/api/user.js';
import { import {
toLogin toLogin
} from '@/libs/login.js'; } from '@/libs/login.js';
import {
memberGradeInfo
} from '@/api/member.js';
import { import {
mapGetters mapGetters
} from "vuex"; } from "vuex";
// #ifdef MP
import {
base64src
} from '@/utils/base64src.js'
import authorize from '@/components/Authorize';
import {
getQrcode
} from '@/api/api.js';
// #endif
import home from '@/components/home';
import {
imageBase64
} from "@/api/public";
import appConfig from '@/config/app.js' import appConfig from '@/config/app.js'
import QRCode from 'qrcode'
import * as htmlToImage from 'html-to-image'
export default { export default {
components: {
// #ifdef MP
authorize,
// #endif
home
},
data() { data() {
return { return {
imgUrls: [], activityList: [],
indicatorDots: false, posterUrl: '',
circular: false, isHideBtn: false
autoplay: false,
interval: 3000,
duration: 500,
swiperIndex: 0,
spreadList: [],
poster: '',
isAuto: false, //没有授权的不会自动授权
isShowAuth: false, //是否隐藏授权
qrcodeSize: 3000,
PromotionCode: '',
base64List: [],
canvasStatus: true //海报绘图标签
}; };
}, },
computed: mapGetters(['isLogin', 'uid', 'userInfo','tenantId']), computed: mapGetters(['isLogin', 'uid', 'userInfo', 'tenantId', 'tenantInfo']),
// watch: {
// isLogin: {
// handler: function(newV, oldV) {
// if (newV) {
// this.userSpreadBannerList();
// }
// },
// deep: true
// }
// },
onLoad() { onLoad() {
if (this.isLogin) { if (!this.isLogin) {
this.userSpreadBannerList(); toLogin()
} else { } else {
toLogin(); this.getActivityInfo()
} }
}, },
/**
* 用户点击右上角分享
*/
// #ifdef MP
onShareAppMessage: function() {
return {
title: this.userInfo.nickname + '-分销海报',
imageUrl: this.spreadList[0].pic,
path: '/pages/index/index?spid=' + this.uid,
};
},
// #endif
onReady() {}, onReady() {},
methods: { methods: {
userSpreadBannerList: function() { downImage() {
let that = this; const that = this
uni.showLoading({ uni.showLoading({
title: '获取中', title: '生成海报中',
mask: true,
})
spreadBanner({
page: 1,
limit: 5
}).then(res => {
uni.hideLoading();
const list = res.data.map((item) => item.pic)
that.$set(that, 'spreadList', res.data);
that.$set(that, 'base64List', list);
that.make();
// that.getImageBase64(res.data);
}).catch(err => {
uni.hideLoading();
});
},
getImageBase64: function(images) {
uni.showLoading({
title: '海报生成中',
mask: true mask: true
}); });
let that = this; that.isHideBtn = true
// #ifdef H5 htmlToImage.toJpeg(document.getElementById('poster-wrap'), {
let spreadList = [] quality: 0.95,
// 生成一个Promise对象的数组 cacheBust: true
images.forEach(item => {
const oneApi = imageBase64(item.pic).then(res => {
return res.data.code;
}) })
spreadList.push(oneApi) .then(function(dataUrl) {
}) console.log('dataUrl', dataUrl)
Promise.all(spreadList).then(result => { uni.hideLoading()
console.log('result', result) that.posterUrl = dataUrl
that.$set(that, 'base64List', result); that.$util.Tips({
that.make(); title: '生成成功，长按保存图片'
that.setShareInfoStatus(); })
})
// #endif
// #ifdef MP
that.base64List = images.map(item => {
return item.pic
});
// #endif
// #ifdef MP
that.getQrcode();
// #endif
},
// 小程序二维码
getQrcode() {
let that = this;
let data = {
pid: that.uid,
path: 'pages/index/index'
}
let arrImagesUrl = "";
uni.downloadFile({
url: this.base64List[0],
success: (res) => {
arrImagesUrl = res.tempFilePath;
}
});
getQrcode(data).then(res => {
base64src(res.data.code, res => {
that.PromotionCode = res;
}); });
setTimeout(() => {
that.PosterCanvas(arrImagesUrl, that.PromotionCode, that.userInfo.nickname, 0);
}, 300);
}).catch(err => {
uni.hideLoading();
that.$util.Tips({
title: err
});
that.$set(that, 'canvasStatus', false);
});
}, },
// 生成二维码； // 生成二维码；
make() { make() {
let that = this; let that = this;
let href = ''; const url =
// href = window.location.href.split('/pages')[0]; `${appConfig.SPREAD_DOMAIN}${appConfig.SPREAD_LINK}?redirectUrl=${appConfig.SPREAD_DOMAIN}&tenantId=${that.tenantId}&spreadId=${that.uid}`
const url =`${appConfig.SPREAD_DOMAIN}${appConfig.SPREAD_LINK}?redirectUrl=${appConfig.SPREAD_DOMAIN}&tenantId=${that.tenantId}&spreadId=${that.uid}`
console.log('url', url) console.log('url', url)
uQRCode.make({ QRCode.toCanvas(document.getElementById('qrcode').querySelector('canvas'), url, {
canvasId: 'qrcode', scale: 1.5
// text: href + '/pages/index/index?spreadId=' + that.uid, }, function(error) {
text: url, console.log(error)
size: this.qrcodeSize,
margin: 10,
success: res => {
that.PromotionCode = res;
setTimeout(() => {
that.PosterCanvas(this.base64List[0], that.PromotionCode, that.userInfo
.nickname, 0);
}, 300);
},
complete: (res) => {},
fail: res => {
uni.hideLoading();
that.$util.Tips({
title: '海报二维码生成失败！'
});
}
}) })
}, },
PosterCanvas: function(arrImages, code, nickname, index) { // 获取活动套餐信息
let context = uni.createCanvasContext('canvasOne') async getActivityInfo() {
context.clearRect(0, 0, 0, 0); try {
let that = this; uni.showLoading({
console.log('arrImages', arrImages) title: '加载中',
uni.getImageInfo({ mask: true
src: arrImages, });
success: function(res) { const res = await memberGradeInfo()
context.drawImage(arrImages, 0, 0, 750, 1190); this.activityList = res.data
context.save(); // 生成二维码
context.drawImage(code, 110, 700, 300, 300); setTimeout(() => {
context.restore(); this.make()
context.setFontSize(28); }, 500)
context.fillText(nickname, 270, 980); } catch (e) {
context.fillText('邀请您加入', 270, 1020); this.$util.Tips({
setTimeout(() => { title: '获取活动信息失败'
context.draw(true, function() { })
uni.canvasToTempFilePath({ } finally {
destWidth: 750, uni.hideLoading()
destHeight: 1190,
canvasId: 'canvasOne',
fileType: 'jpg',
success: function(res) {
// 在H5平台下，tempFilePath 为 base64
uni.hideLoading();
that.spreadList[index].pic = res
.tempFilePath;
that.$set(that, 'poster', res
.tempFilePath);
that.$set(that, 'canvasStatus', false);
}
})
})
}, 100);
},
fail: function(err) {
uni.hideLoading();
that.$util.Tips({
title: '无法获取图片信息'
});
}
});
},
onLoadFun: function(e) {
this.$set(this, 'userInfo', e);
this.userSpreadBannerList();
},
// 授权关闭
authColse: function(e) {
this.isShowAuth = e
},
bindchange(e) {
let base64List = this.base64List;
let index = e.detail.current;
this.swiperIndex = index;
let arrImagesUrl = "";
uni.downloadFile({
url: base64List[index],
success: (res) => {
arrImagesUrl = res.tempFilePath;
setTimeout(() => {
this.$set(this, 'canvasStatus', true);
this.PosterCanvas(arrImagesUrl, this.PromotionCode, this.userInfo.nickname,
index);
}, 300);
}
});
},
// 点击保存海报
savePosterPath: function() {
let that = this;
uni.getSetting({
success(res) {
if (!res.authSetting['scope.writePhotosAlbum']) {
uni.authorize({
scope: 'scope.writePhotosAlbum',
success() {
uni.saveImageToPhotosAlbum({
filePath: that.poster,
success: function(res) {
that.$util.Tips({
title: '保存成功',
icon: 'success'
});
},
fail: function(res) {
that.$util.Tips({
title: '保存失败'
});
}
});
}
});
} else {
uni.saveImageToPhotosAlbum({
filePath: that.poster,
success: function(res) {
that.$util.Tips({
title: '保存成功',
icon: 'success'
});
},
fail: function(res) {
that.$util.Tips({
title: '保存失败'
});
}
});
}
}
});
},
setShareInfoStatus: function() {
if (this.$wechat.isWeixin()) {
let configAppMessage = {
desc: '分销海报',
title: this.userInfo.nickname + '-分销海报',
link: '/pages/index/index?spread=' + this.uid,
imgUrl: this.spreadList[0].pic
};
this.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"],
configAppMessage)
} }
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
page { page {
background-color: #a3a3a3 !important; background-color: #F8EEEF !important;
height: 100% !important; height: 100vh;
overflow: auto;
}
.main-page{
height: 100%;
overflow: auto;
}
.spread-wrap {
height: 100%;
background: url('@/static/images/spread_bg.png') center 0 no-repeat;
background-size: 100% auto;
position: relative;
background-color: #F8EEEF;
}
.logo-wrap {
text-align: center;
padding-top: 53rpx;
.logo-image {
width: 160rpx;
height: 141rpx;
}
}
.activity-wrap {
position: absolute;
top: 460rpx;
left: 104rpx;
right: 110rpx;
.tenant-info-wrap {
position: absolute;
left: 0;
right: 0;
top: 656rpx;
.info-wrap {
display: flex;
justify-content: space-between;
}
.qrcode-wrap {
margin-left: 40rpx;
}
.address {
margin-top: 18rpx;
}
.logon {
width: 100%;
height: 70rpx;
margin: 30rpx 0;
color: #FFFFFF;
font-size: 28rpx;
background: linear-gradient(0deg, #E63163 0%, #FF819F 100%);
border-radius: 44rpx;
}
}
.service-phone {
position: absolute;
bottom: -114rpx;
right: 48rpx;
font-size: 30rpx;
color: #ED387C;
font-style: italic;
font-weight: bold;
}
.tips {
font-size: 28rpx;
color: #000;
}
.item-wrap {
font-size: 26rpx;
font-style: italic;
color: #010101;
font-weight: bold;
margin-bottom: 54rpx;
padding-left: 227rpx;
.text span {
color: #C80D00;
}
}
} }
.canvas { .canvas {
position: relative; position: relative;
} }
.distribution-posters {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.distribution-posters swiper {
width: 100%;
height: 1000rpx;
position: relative;
margin-top: 40rpx;
}
.distribution-posters .slide-image {
width: 100%;
height: 100%;
margin: 0 auto;
border-radius: 15rpx;
}
.distribution-posters .slide-image.active {
transform: none;
transition: all 0.2s ease-in 0s;
}
.distribution-posters .slide-image.quiet {
transform: scale(0.8333333);
transition: all 0.2s ease-in 0s;
}
.distribution-posters .keep {
font-size: 30rpx;
color: #fff;
width: 600rpx;
height: 80rpx;
border-radius: 50rpx;
text-align: center;
line-height: 80rpx;
margin: 38rpx auto;
}
.distribution-posters .preserve {
color: #fff;
text-align: center;
margin-top: 38rpx;
}
.distribution-posters .preserve .line {
width: 100rpx;
height: 1px;
background-color: #fff;
}
.distribution-posters .preserve .tip {
margin: 0 30rpx;
}
</style> </style>

BIN
yudao-ui-app/static/images/spread_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 MiB