新增产品枚举
This commit is contained in:
@ -19,6 +19,7 @@ import co.yixiang.annotation.AnonymousAccess;
|
||||
import co.yixiang.aop.log.Log;
|
||||
import co.yixiang.common.api.ApiResult;
|
||||
import co.yixiang.common.web.controller.BaseController;
|
||||
import co.yixiang.enums.AppFromEnum;
|
||||
import co.yixiang.modules.activity.entity.YxStoreBargainUser;
|
||||
import co.yixiang.modules.activity.entity.YxStoreBargainUserHelp;
|
||||
import co.yixiang.modules.activity.service.YxStoreBargainService;
|
||||
@ -296,7 +297,9 @@ public class StoreBargainController extends BaseController {
|
||||
|
||||
YxUserQueryVo userInfo = yxUserService.getYxUserById(uid);
|
||||
String userType = userInfo.getUserType();
|
||||
if(!userType.equals("routine")) userType = "H5";
|
||||
if(!userType.equals(AppFromEnum.ROUNTINE.getValue())) {
|
||||
userType = AppFromEnum.H5.getValue();
|
||||
}
|
||||
String name = bargainId+"_"+uid + "_"+userType+"_bargain_share_wap.jpg";
|
||||
YxSystemAttachment attachment = systemAttachmentService.getInfo(name);
|
||||
String fileDir = path+"qrcode"+ File.separator;
|
||||
@ -305,7 +308,7 @@ public class StoreBargainController extends BaseController {
|
||||
//生成二维码
|
||||
//判断用户是否小程序,注意小程序二维码生成路径要与H5不一样 不然会导致都跳转到小程序问题
|
||||
File file = FileUtil.mkdir(new File(fileDir));
|
||||
if(userType.equals("routine")){
|
||||
if(userType.equals(AppFromEnum.ROUNTINE.getValue())){
|
||||
siteUrl = siteUrl+"/bargain/";
|
||||
QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid, 180, 180,
|
||||
FileUtil.file(fileDir+name));
|
||||
|
@ -18,6 +18,7 @@ import co.yixiang.annotation.AnonymousAccess;
|
||||
import co.yixiang.aop.log.Log;
|
||||
import co.yixiang.common.api.ApiResult;
|
||||
import co.yixiang.common.web.controller.BaseController;
|
||||
import co.yixiang.enums.AppFromEnum;
|
||||
import co.yixiang.modules.activity.entity.YxStorePink;
|
||||
import co.yixiang.modules.activity.service.YxStoreCombinationService;
|
||||
import co.yixiang.modules.activity.service.YxStorePinkService;
|
||||
@ -131,7 +132,9 @@ public class StoreCombinationController extends BaseController {
|
||||
int uid = SecurityUtils.getUserId().intValue();
|
||||
YxUserQueryVo userInfo = yxUserService.getYxUserById(uid);
|
||||
String userType = userInfo.getUserType();
|
||||
if(!userType.equals("routine")) userType = "H5";
|
||||
if(!userType.equals(AppFromEnum.ROUNTINE.getValue())) {
|
||||
userType = AppFromEnum.H5.getValue();
|
||||
}
|
||||
String name = pinkId+"_"+uid + "_"+userType+"_pink_share_wap.jpg";
|
||||
YxSystemAttachment attachment = systemAttachmentService.getInfo(name);
|
||||
String fileDir = path+"qrcode"+ File.separator;
|
||||
@ -140,7 +143,7 @@ public class StoreCombinationController extends BaseController {
|
||||
//生成二维码
|
||||
//String fileDir = path+"qrcode"+File.separator;
|
||||
File file = FileUtil.mkdir(new File(fileDir));
|
||||
if(userType.equals("routine")){
|
||||
if(userType.equals(AppFromEnum.ROUNTINE.getValue())){
|
||||
siteUrl = siteUrl+"/pink/";
|
||||
QrCodeUtil.generate(siteUrl+"?pinkId="+pinkId+"&spread="+uid, 180, 180,
|
||||
FileUtil.file(fileDir+name));
|
||||
|
@ -266,7 +266,10 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
YxStoreOrderQueryVo orderQueryVo = getOrderInfo(param.getOrderId(),0);
|
||||
if(ObjectUtil.isNull(orderQueryVo)) throw new ErrorRequestException("订单不存在");
|
||||
|
||||
if(orderQueryVo.getStatus() != 0 || orderQueryVo.getPaid() == 0) throw new ErrorRequestException("订单状态错误");
|
||||
if(!orderQueryVo.getStatus().equals(OrderInfoEnum.STATUS_0.getValue()) ||
|
||||
orderQueryVo.getPaid().equals(OrderInfoEnum.PAY_STATUS_0.getValue())){
|
||||
throw new ErrorRequestException("订单状态错误");
|
||||
}
|
||||
|
||||
YxExpressQueryVo expressQueryVo = expressService
|
||||
.getYxExpressById(Integer.valueOf(param.getDeliveryName()));
|
||||
@ -274,7 +277,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
|
||||
YxStoreOrder storeOrder = new YxStoreOrder();
|
||||
storeOrder.setId(orderQueryVo.getId());
|
||||
storeOrder.setStatus(1);
|
||||
storeOrder.setStatus(OrderInfoEnum.STATUS_1.getValue());
|
||||
storeOrder.setDeliveryId(param.getDeliveryId());
|
||||
storeOrder.setDeliveryName(expressQueryVo.getName());
|
||||
storeOrder.setDeliveryType(param.getDeliveryType());
|
||||
@ -457,8 +460,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
userBill.setNumber(order.getUseIntegral());
|
||||
userBill.setBalance(userQueryVo.getIntegral());
|
||||
userBill.setMark("购买商品失败,回退积分");
|
||||
userBill.setStatus(1);
|
||||
userBill.setPm(1);
|
||||
userBill.setStatus(BillEnum.STATUS_1.getValue());
|
||||
userBill.setPm(BillEnum.PM_1.getValue());
|
||||
userBill.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
billService.save(userBill);
|
||||
|
||||
@ -478,7 +481,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
public void cancelOrder(String orderId, int uid) {
|
||||
YxStoreOrderQueryVo order = getOrderInfo(orderId,uid);
|
||||
if(ObjectUtil.isNull(order)) throw new ErrorRequestException("订单不存在");
|
||||
if(order.getIsDel() == 1)throw new ErrorRequestException("订单已取消");
|
||||
if(order.getIsDel().equals(OrderInfoEnum.CANCEL_STATUS_1.getValue()))throw new ErrorRequestException("订单已取消");
|
||||
regressionIntegral(order);
|
||||
|
||||
regressionStock(order);
|
||||
@ -486,7 +489,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
regressionCoupon(order);
|
||||
|
||||
YxStoreOrder storeOrder = new YxStoreOrder();
|
||||
storeOrder.setIsDel(1);
|
||||
storeOrder.setIsDel(OrderInfoEnum.CANCEL_STATUS_1.getValue());
|
||||
storeOrder.setId(order.getId());
|
||||
yxStoreOrderMapper.updateById(storeOrder);
|
||||
}
|
||||
@ -503,7 +506,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
|
||||
if(ObjectUtil.isNull(order)) throw new ErrorRequestException("订单不存在");
|
||||
|
||||
if(order.getIsDel() == 1)throw new ErrorRequestException("订单已取消");
|
||||
if(order.getIsDel() == OrderInfoEnum.CANCEL_STATUS_1.getValue())throw new ErrorRequestException("订单已取消");
|
||||
|
||||
regressionIntegral(order);
|
||||
|
||||
@ -512,7 +515,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
regressionCoupon(order);
|
||||
|
||||
YxStoreOrder storeOrder = new YxStoreOrder();
|
||||
storeOrder.setIsDel(1);
|
||||
storeOrder.setIsDel(OrderInfoEnum.CANCEL_STATUS_1.getValue());
|
||||
storeOrder.setId(order.getId());
|
||||
yxStoreOrderMapper.updateById(storeOrder);
|
||||
} catch (Exception e) {
|
||||
@ -547,8 +550,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
userBill.setNumber(order.getGainIntegral());
|
||||
userBill.setBalance(userQueryVo.getIntegral());
|
||||
userBill.setMark("购买商品赠送");
|
||||
userBill.setStatus(1);
|
||||
userBill.setPm(1);
|
||||
userBill.setStatus(BillEnum.STATUS_1.getValue());
|
||||
userBill.setPm(BillEnum.PM_1.getValue());
|
||||
userBill.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
billService.save(userBill);
|
||||
|
||||
@ -573,7 +576,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
}
|
||||
|
||||
YxStoreOrder storeOrder = new YxStoreOrder();
|
||||
storeOrder.setIsDel(1);
|
||||
storeOrder.setIsDel(OrderInfoEnum.CANCEL_STATUS_1.getValue());
|
||||
storeOrder.setId(order.getId());
|
||||
yxStoreOrderMapper.updateById(storeOrder);
|
||||
|
||||
@ -594,7 +597,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
if(!order.get_status().get_type().equals("2")) throw new ErrorRequestException("订单状态错误");
|
||||
|
||||
YxStoreOrder storeOrder = new YxStoreOrder();
|
||||
storeOrder.setStatus(2);
|
||||
storeOrder.setStatus(OrderInfoEnum.STATUS_2.getValue());
|
||||
storeOrder.setId(order.getId());
|
||||
yxStoreOrderMapper.updateById(storeOrder);
|
||||
|
||||
@ -623,7 +626,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
if(order.getStatus() == 1 ) throw new ErrorRequestException("订单当前无法退款");
|
||||
|
||||
YxStoreOrder storeOrder = new YxStoreOrder();
|
||||
storeOrder.setRefundStatus(1);
|
||||
storeOrder.setRefundStatus(OrderInfoEnum.REFUND_STATUS_1.getValue());
|
||||
storeOrder.setRefundReasonTime(OrderUtil.getSecondTimestampTwo());
|
||||
storeOrder.setRefundReasonWapExplain(param.getRefund_reason_wap_explain());
|
||||
storeOrder.setRefundReasonWapImg(param.getRefund_reason_wap_img());
|
||||
@ -958,7 +961,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
QueryWrapper<YxStoreOrder> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq("order_id",orderId);
|
||||
YxStoreOrder storeOrder = new YxStoreOrder();
|
||||
storeOrder.setPaid(1);
|
||||
storeOrder.setPaid(OrderInfoEnum.PAY_STATUS_1.getValue());
|
||||
storeOrder.setPayType(payType);
|
||||
storeOrder.setPayTime(OrderUtil.getSecondTimestampTwo());
|
||||
yxStoreOrderMapper.update(storeOrder,wrapper);
|
||||
@ -1032,7 +1035,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
public WxPayMwebOrderResult wxH5Pay(String orderId) throws WxPayException {
|
||||
YxStoreOrderQueryVo orderInfo = getOrderInfo(orderId,0);
|
||||
if(ObjectUtil.isNull(orderInfo)) throw new ErrorRequestException("订单不存在");
|
||||
if(orderInfo.getPaid() == 1) throw new ErrorRequestException("该订单已支付");
|
||||
if(orderInfo.getPaid().equals(OrderInfoEnum.PAY_STATUS_1.getValue())) throw new ErrorRequestException("该订单已支付");
|
||||
|
||||
if(orderInfo.getPayPrice().doubleValue() <= 0) throw new ErrorRequestException("该支付无需支付");
|
||||
|
||||
@ -1060,7 +1063,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
public WxPayMpOrderResult wxAppPay(String orderId) throws WxPayException {
|
||||
YxStoreOrderQueryVo orderInfo = getOrderInfo(orderId,0);
|
||||
if(ObjectUtil.isNull(orderInfo)) throw new ErrorRequestException("订单不存在");
|
||||
if(orderInfo.getPaid() == 1) throw new ErrorRequestException("该订单已支付");
|
||||
if(orderInfo.getPaid().equals(OrderInfoEnum.PAY_STATUS_1.getValue())) throw new ErrorRequestException("该订单已支付");
|
||||
|
||||
if(orderInfo.getPayPrice().doubleValue() <= 0) throw new ErrorRequestException("该支付无需支付");
|
||||
|
||||
@ -1086,7 +1089,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
public WxPayMpOrderResult wxPay(String orderId) throws WxPayException {
|
||||
YxStoreOrderQueryVo orderInfo = getOrderInfo(orderId,0);
|
||||
if(ObjectUtil.isNull(orderInfo)) throw new ErrorRequestException("订单不存在");
|
||||
if(orderInfo.getPaid() == 1) throw new ErrorRequestException("该订单已支付");
|
||||
if(orderInfo.getPaid().equals(OrderInfoEnum.PAY_STATUS_1.getValue())) throw new ErrorRequestException("该订单已支付");
|
||||
|
||||
if(orderInfo.getPayPrice().doubleValue() <= 0) throw new ErrorRequestException("该支付无需支付");
|
||||
|
||||
@ -1114,7 +1117,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
YxStoreOrderQueryVo orderInfo = getOrderInfo(orderId,uid);
|
||||
if(ObjectUtil.isNull(orderInfo)) throw new ErrorRequestException("订单不存在");
|
||||
|
||||
if(orderInfo.getPaid() == 1) throw new ErrorRequestException("该订单已支付");
|
||||
if(orderInfo.getPaid().equals(OrderInfoEnum.PAY_STATUS_1.getValue())) throw new ErrorRequestException("该订单已支付");
|
||||
|
||||
YxUserQueryVo userInfo = userService.getYxUserById(uid);
|
||||
|
||||
@ -1133,8 +1136,8 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
userBill.setNumber(orderInfo.getPayPrice());
|
||||
userBill.setBalance(userInfo.getNowMoney());
|
||||
userBill.setMark("余额支付");
|
||||
userBill.setStatus(1);
|
||||
userBill.setPm(0);
|
||||
userBill.setStatus(BillEnum.STATUS_1.getValue());
|
||||
userBill.setPm(BillEnum.PM_0.getValue());
|
||||
userBill.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
billService.save(userBill);
|
||||
|
||||
@ -1298,7 +1301,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
|
||||
storeOrder.setPayPrice(BigDecimal.valueOf(payPrice));
|
||||
storeOrder.setPayPostage(BigDecimal.valueOf(payPostage));
|
||||
storeOrder.setDeductionPrice(BigDecimal.valueOf(deductionPrice));
|
||||
storeOrder.setPaid(0);
|
||||
storeOrder.setPaid(OrderInfoEnum.PAY_STATUS_0.getValue());
|
||||
storeOrder.setPayType(param.getPayType());
|
||||
storeOrder.setUseIntegral(BigDecimal.valueOf(usedIntegral));
|
||||
storeOrder.setGainIntegral(BigDecimal.valueOf(gainIntegral));
|
||||
|
@ -20,6 +20,8 @@ import co.yixiang.annotation.AnonymousAccess;
|
||||
import co.yixiang.aop.log.Log;
|
||||
import co.yixiang.common.api.ApiCode;
|
||||
import co.yixiang.common.api.ApiResult;
|
||||
import co.yixiang.constant.ShopConstants;
|
||||
import co.yixiang.enums.AppFromEnum;
|
||||
import co.yixiang.exception.ErrorRequestException;
|
||||
import co.yixiang.modules.notify.NotifyService;
|
||||
import co.yixiang.modules.notify.NotifyType;
|
||||
@ -182,10 +184,10 @@ public class AuthController {
|
||||
YxUser user = new YxUser();
|
||||
user.setAccount(nickname);
|
||||
user.setUsername(wxMpUser.getOpenId());
|
||||
user.setPassword(passwordEncoder.encode("123456"));
|
||||
user.setPwd(passwordEncoder.encode("123456"));
|
||||
user.setPassword(passwordEncoder.encode(ShopConstants.YSHOP_DEFAULT_PWD));
|
||||
user.setPwd(passwordEncoder.encode(ShopConstants.YSHOP_DEFAULT_PWD));
|
||||
user.setPhone("");
|
||||
user.setUserType("wechat");
|
||||
user.setUserType(AppFromEnum.WECHAT.getValue());
|
||||
user.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
user.setLastTime(OrderUtil.getSecondTimestampTwo());
|
||||
user.setNickname(nickname);
|
||||
@ -240,7 +242,7 @@ public class AuthController {
|
||||
|
||||
UsernamePasswordAuthenticationToken authenticationToken =
|
||||
new UsernamePasswordAuthenticationToken(jwtUser.getUsername(),
|
||||
"123456");
|
||||
ShopConstants.YSHOP_DEFAULT_PWD);
|
||||
|
||||
Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
|
||||
SecurityContextHolder.getContext().setAuthentication(authentication);
|
||||
@ -320,10 +322,10 @@ public class AuthController {
|
||||
YxUser user = new YxUser();
|
||||
user.setAccount(nickname);
|
||||
user.setUsername(wxMpUser.getOpenId());
|
||||
user.setPassword(passwordEncoder.encode("123456"));
|
||||
user.setPwd(passwordEncoder.encode("123456"));
|
||||
user.setPassword(passwordEncoder.encode(ShopConstants.YSHOP_DEFAULT_PWD));
|
||||
user.setPwd(passwordEncoder.encode(ShopConstants.YSHOP_DEFAULT_PWD));
|
||||
user.setPhone("");
|
||||
user.setUserType("routine");
|
||||
user.setUserType(AppFromEnum.ROUNTINE.getValue());
|
||||
user.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
user.setLastTime(OrderUtil.getSecondTimestampTwo());
|
||||
user.setNickname(nickname);
|
||||
@ -369,7 +371,7 @@ public class AuthController {
|
||||
|
||||
UsernamePasswordAuthenticationToken authenticationToken =
|
||||
new UsernamePasswordAuthenticationToken(jwtUser.getUsername(),
|
||||
"123456");
|
||||
ShopConstants.YSHOP_DEFAULT_PWD);
|
||||
|
||||
Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
|
||||
SecurityContextHolder.getContext().setAuthentication(authentication);
|
||||
@ -467,11 +469,11 @@ public class AuthController {
|
||||
user.setPassword(passwordEncoder.encode(param.getPassword()));
|
||||
user.setPwd(passwordEncoder.encode(param.getPassword()));
|
||||
user.setPhone(param.getAccount());
|
||||
user.setUserType("h5");
|
||||
user.setUserType(AppFromEnum.H5.getValue());
|
||||
user.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
user.setLastTime(OrderUtil.getSecondTimestampTwo());
|
||||
user.setNickname(param.getAccount());
|
||||
user.setAvatar("https://image.dayouqiantu.cn/5dc2c7f3a104c.png");
|
||||
user.setAvatar(ShopConstants.YSHOP_DEFAULT_AVATAR);
|
||||
user.setNowMoney(BigDecimal.ZERO);
|
||||
user.setBrokeragePrice(BigDecimal.ZERO);
|
||||
user.setIntegral(BigDecimal.ZERO);
|
||||
|
@ -17,6 +17,8 @@ import co.yixiang.annotation.AnonymousAccess;
|
||||
import co.yixiang.aop.log.Log;
|
||||
import co.yixiang.common.api.ApiResult;
|
||||
import co.yixiang.common.web.controller.BaseController;
|
||||
import co.yixiang.enums.AppFromEnum;
|
||||
import co.yixiang.enums.ProductEnum;
|
||||
import co.yixiang.modules.shop.service.YxStoreProductRelationService;
|
||||
import co.yixiang.modules.shop.service.YxStoreProductReplyService;
|
||||
import co.yixiang.modules.shop.service.YxStoreProductService;
|
||||
@ -77,13 +79,13 @@ public class StoreProductController extends BaseController {
|
||||
@ApiOperation(value = "获取首页更多产品",notes = "获取首页更多产品")
|
||||
public ApiResult<Map<String,Object>> moreGoodsList(@PathVariable Integer type){
|
||||
Map<String,Object> map = new LinkedHashMap<>();
|
||||
if(type == 1){//TODO 精品推荐
|
||||
if(type.equals(ProductEnum.TYPE_1.getValue())){//TODO 精品推荐
|
||||
map.put("list",storeProductService.getList(1,20,1));
|
||||
}else if(type == 2){//TODO 热门榜单
|
||||
}else if(type.equals(ProductEnum.TYPE_2.getValue())){//TODO 热门榜单
|
||||
map.put("list",storeProductService.getList(1,20,4));
|
||||
}else if(type == 3){//TODO 首发新品
|
||||
}else if(type.equals(ProductEnum.TYPE_3.getValue())){//TODO 首发新品
|
||||
map.put("list",storeProductService.getList(1,20,2));
|
||||
}else if(type == 4){//TODO 促销单品
|
||||
}else if(type.equals(ProductEnum.TYPE_4.getValue())){//TODO 促销单品
|
||||
map.put("list",storeProductService.getList(1,20,3));
|
||||
}
|
||||
|
||||
@ -134,7 +136,9 @@ public class StoreProductController extends BaseController {
|
||||
|
||||
YxUserQueryVo userInfo = yxUserService.getYxUserById(uid);
|
||||
String userType = userInfo.getUserType();
|
||||
if(!userType.equals("routine")) userType = "H5";
|
||||
if(!userType.equals(AppFromEnum.ROUNTINE.getValue())) {
|
||||
userType = AppFromEnum.H5.getValue();
|
||||
}
|
||||
String name = id+"_"+uid + "_"+userType+"_product_detail_wap.jpg";
|
||||
YxSystemAttachment attachment = systemAttachmentService.getInfo(name);
|
||||
String fileDir = path+"qrcode"+ File.separator;
|
||||
@ -143,7 +147,7 @@ public class StoreProductController extends BaseController {
|
||||
if(ObjectUtil.isNull(attachment)){
|
||||
//生成二维码
|
||||
File file = FileUtil.mkdir(new File(fileDir));
|
||||
if(userType.equals("routine")){
|
||||
if(userType.equals(AppFromEnum.ROUNTINE.getValue())){
|
||||
//下载图片
|
||||
siteUrl = siteUrl+"/product/";
|
||||
QrCodeUtil.generate(siteUrl+"?productId="+id+"&spread="+uid, 180, 180,
|
||||
@ -165,7 +169,7 @@ public class StoreProductController extends BaseController {
|
||||
routineQrcodeUrl = apiUrl + "/api/file/" + attachment.getSattDir();
|
||||
}
|
||||
|
||||
if(userType.equals("routine")){
|
||||
if(userType.equals(AppFromEnum.ROUNTINE.getValue())){
|
||||
productDTO.getStoreInfo().setCodeBase(routineQrcodeUrl);
|
||||
}else{
|
||||
try {
|
||||
|
@ -10,6 +10,7 @@ package co.yixiang.modules.user.service.impl;
|
||||
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import co.yixiang.enums.BillEnum;
|
||||
import co.yixiang.exception.ErrorRequestException;
|
||||
import co.yixiang.modules.user.entity.YxUser;
|
||||
import co.yixiang.modules.user.entity.YxUserBill;
|
||||
@ -127,8 +128,8 @@ public class YxUserExtractServiceImpl extends BaseServiceImpl<YxUserExtractMappe
|
||||
userBill.setNumber(BigDecimal.valueOf(money));
|
||||
userBill.setBalance(BigDecimal.valueOf(balance));
|
||||
userBill.setMark(mark);
|
||||
userBill.setStatus(1);
|
||||
userBill.setPm(0);
|
||||
userBill.setStatus(BillEnum.STATUS_1.getValue());
|
||||
userBill.setPm(BillEnum.PM_0.getValue());
|
||||
userBill.setAddTime(OrderUtil.getSecondTimestampTwo());
|
||||
billService.save(userBill);
|
||||
|
||||
|
@ -16,6 +16,7 @@ import cn.hutool.extra.qrcode.QrCodeUtil;
|
||||
import co.yixiang.aop.log.Log;
|
||||
import co.yixiang.common.api.ApiResult;
|
||||
import co.yixiang.common.web.controller.BaseController;
|
||||
import co.yixiang.enums.AppFromEnum;
|
||||
import co.yixiang.modules.shop.service.YxSystemConfigService;
|
||||
import co.yixiang.modules.user.entity.YxSystemAttachment;
|
||||
import co.yixiang.modules.user.service.YxSystemAttachmentService;
|
||||
@ -136,7 +137,9 @@ public class UserBillController extends BaseController {
|
||||
}
|
||||
|
||||
String userType = userInfo.getUserType();
|
||||
if(!userType.equals("routine")) userType = "H5";
|
||||
if(!userType.equals(AppFromEnum.ROUNTINE.getValue())) {
|
||||
userType = AppFromEnum.H5.getValue();
|
||||
}
|
||||
|
||||
String name = uid + "_"+userType+"_user_wap.jpg";
|
||||
|
||||
@ -146,7 +149,7 @@ public class UserBillController extends BaseController {
|
||||
if(ObjectUtil.isNull(attachment)){
|
||||
//生成二维码
|
||||
//判断用户是否小程序,注意小程序二维码生成路径要与H5不一样 不然会导致都跳转到小程序问题
|
||||
if(userType.equals("routine")){
|
||||
if(userType.equals(AppFromEnum.ROUNTINE.getValue())){
|
||||
siteUrl = siteUrl+"/distribution/";
|
||||
}
|
||||
File file = FileUtil.mkdir(new File(fileDir));
|
||||
|
@ -34,6 +34,16 @@ public interface ShopConstants {
|
||||
*/
|
||||
String YSHOP_WEIXIN_MP_SERVICE = "yshop_weixin_mp_service";
|
||||
|
||||
/**
|
||||
* 商城默认密码
|
||||
*/
|
||||
String YSHOP_DEFAULT_PWD = "123456";
|
||||
|
||||
/**
|
||||
* 商城默认注册图片
|
||||
*/
|
||||
String YSHOP_DEFAULT_AVATAR = "https://image.dayouqiantu.cn/5dc2c7f3a104c.png";
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -26,7 +26,12 @@ public enum OrderInfoEnum {
|
||||
|
||||
BARGAIN_STATUS_1(1,"参与中"),
|
||||
BARGAIN_STATUS_2(2,"参与失败"),
|
||||
BARGAIN_STATUS_3(3,"参与成功");
|
||||
BARGAIN_STATUS_3(3,"参与成功"),
|
||||
|
||||
CANCEL_STATUS_0(0,"正常"),
|
||||
CANCEL_STATUS_1(1,"已取消");
|
||||
|
||||
|
||||
|
||||
private Integer value;
|
||||
private String desc;
|
||||
|
23
yshop-common/src/main/java/co/yixiang/enums/ProductEnum.java
Normal file
23
yshop-common/src/main/java/co/yixiang/enums/ProductEnum.java
Normal file
@ -0,0 +1,23 @@
|
||||
package co.yixiang.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* 产品相关枚举
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum ProductEnum {
|
||||
|
||||
TYPE_1(1,"精品推荐"),
|
||||
TYPE_2(2,"热门榜单"),
|
||||
TYPE_3(3,"首发新品"),
|
||||
TYPE_4(4,"促销单品");
|
||||
|
||||
|
||||
private Integer value;
|
||||
private String desc;
|
||||
|
||||
|
||||
}
|
Reference in New Issue
Block a user