Skip to content

G
gogirl-miniapp-backend
Commit cafd219b by huluobin
Options

分页参数全部换成新的。

parent fd3b77da
Showing with 237 additions and 681 deletions
pom.xml
......@@ -71,12 +71,6 @@
<version>2.6.2</version>
</dependency>
<!--2.0版本分页插件-->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.5</version>
</dependency>
<!--springboot自动配置-->
<dependency>
......
src/main/java/com/gogirl/application/market/CouponCustomerRelevanceService.java
package com.gogirl.application.market;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.gogirl.domain.market.coupon.CouponCustomerRelevance;
import java.util.List;
......@@ -27,7 +27,7 @@ public interface CouponCustomerRelevanceService extends IService<CouponCustomerR
* @param containRemoveCoupon
* @return
*/
PageInfo<CouponCustomerRelevance> selectMyCoupon(Integer customerId, Integer pageNum, Integer pageSize, Integer state, Boolean containRemoveCoupon);
IPage<CouponCustomerRelevance> selectMyCoupon(Integer customerId, Integer pageNum, Integer pageSize, Integer state, Boolean containRemoveCoupon);
/**
* 美甲师提交外部券
......
src/main/java/com/gogirl/application/market/CouponService.java
package com.gogirl.application.market;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.gogirl.domain.market.coupon.Coupon;
import com.gogirl.domain.market.coupon.CouponCustomerRelevance;
......
src/main/java/com/gogirl/application/market/impl/CouponCustomerRelevanceServiceImpl.java
package com.gogirl.application.market.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.gogirl.application.market.CouponCustomerRelevanceService;
import com.gogirl.application.market.MarketService;
import com.gogirl.domain.market.coupon.Coupon;
......@@ -101,32 +101,30 @@ public class CouponCustomerRelevanceServiceImpl extends ServiceImpl<CouponCustom
}
@Override
public PageInfo<CouponCustomerRelevance> selectMyCoupon(Integer customerId, Integer pageNum, Integer pageSize, Integer state, Boolean containRemoveCoupon) {
if (pageNum != null && pageSize != null) {
PageHelper.startPage(pageNum, pageSize);
}
List<CouponCustomerRelevance> couponCustomerRelevanceList = couponCustomerRelevanceMapper.selectList(new LambdaQueryWrapper<CouponCustomerRelevance>().eq(CouponCustomerRelevance::getCustomerId, customerId));
this.joinCouponCustomerRelevanceMapper(couponCustomerRelevanceList);
public IPage<CouponCustomerRelevance> selectMyCoupon(Integer customerId, Integer pageNum, Integer pageSize, Integer state, Boolean containRemoveCoupon) {
IPage<CouponCustomerRelevance> page = new Page<>(pageNum, pageSize);
page = couponCustomerRelevanceMapper.selectPage(page, new LambdaQueryWrapper<CouponCustomerRelevance>().eq(CouponCustomerRelevance::getCustomerId, customerId));
this.joinCouponCustomerRelevanceMapper(page.getRecords());
long nowTime = new Date().getTime();
for (int i = 0; i < couponCustomerRelevanceList.size(); i++) {
if (containRemoveCoupon != null && containRemoveCoupon == false && couponCustomerRelevanceList.get(i).getCouponId().equals(66)) {
couponCustomerRelevanceList.remove(i);
for (int i = 0; i < page.getRecords().size(); i++) {
if (containRemoveCoupon != null && !containRemoveCoupon && page.getRecords().get(i).getCouponId().equals(66)) {
page.getRecords().remove(i);
i--;
continue;
}
CouponCustomerRelevance couponCustomerRelevance = couponCustomerRelevanceList.get(i);
CouponCustomerRelevance couponCustomerRelevance = page.getRecords().get(i);
if (nowTime > couponCustomerRelevance.getValidEndTime().getTime() && couponCustomerRelevance.getState() == 1) {
couponCustomerRelevance.setState(3);
}
if (state != null && state != 0 && couponCustomerRelevance != null && couponCustomerRelevance.getState() != null && !couponCustomerRelevance.getState().equals(state)) {
couponCustomerRelevanceList.remove(i);
if (state != null && state != 0 && couponCustomerRelevance.getState() != null && !couponCustomerRelevance.getState().equals(state)) {
page.getRecords().remove(i);
i--;
}
}
PageInfo<CouponCustomerRelevance> pageInfo = new PageInfo<>(couponCustomerRelevanceList);
return pageInfo;
return page;
}
@Override
......
src/main/java/com/gogirl/application/order/member/IChargeOrderService.java
......@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.pagehelper.PageInfo;
import com.gogirl.domain.order.member.ChargeOrder;
import com.gogirl.domain.user.customer.CustomerBalanceRecord;
......
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
......@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.gogirl.application.market.CouponCustomerRelevanceService;
import com.gogirl.application.market.CouponService;
import com.gogirl.application.market.MarketService;
......@@ -596,11 +594,10 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
public Map<String, Object> queryCustomerOrder(String token, Integer customerId, Integer pageNum, Integer pageSize) {
GogirlToken gogirlToken = gogirlTokenService.getByToken(token);
if (pageNum != null && pageSize != null) {
PageHelper.startPage(pageNum, pageSize);
}
IPage<OrderManage> page = new Page<>(pageNum, pageSize);
List<OrderManage> orderManageList = orderManageMapper.selectList(new LambdaQueryWrapper<OrderManage>()
//1、分页查询订单
page = orderManageMapper.selectPage(page, new LambdaQueryWrapper<OrderManage>()
// .eq(OrderManage::getDepartmentId, gogirlToken.getDepartmentId())
.and(wrapper -> wrapper
.eq(OrderManage::getOrderUser, customerId)
......@@ -608,13 +605,12 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
.eq(OrderManage::getPayUser, customerId)))
.orderByDesc(OrderManage::getCreateTime));
//订单记录的图片
for (OrderManage orderManage : orderManageList) {
//订单详情
for (OrderManage orderManage : page.getRecords()) {
//2、订单详情
List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderManage.getId()));
orderManage.setListOrderServer(orderServeList);
//订单客照
//3、订单客照
Set<String> images = orderServeList.stream()
.map(orderServe -> orderRecordMapper.selectOne(new LambdaQueryWrapper<OrderRecord>().eq(OrderRecord::getOrderServeId, orderServe.getId())))
.filter(Objects::nonNull)
......@@ -625,14 +621,15 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
.collect(Collectors.toSet());
orderManage.setImages(images);
//订单会员信息
//4、订单会员信息
Customer customer = customerService.getById(orderManage.getOrderUser());
orderManage.setCustomer(customer);
//支付用户信息
//5、支付用户信息
Customer payCustomer = customerService.getById(orderManage.getPayUser());
orderManage.setPayCustomer(payCustomer);
//6、订单服务款式
orderServeList.forEach(orderServe -> {
//订单详情 款式sku
List<OrderServeSku> orderServeSkuList = orderServeSkuMapper.selectList(new LambdaQueryWrapper<OrderServeSku>().eq(OrderServeSku::getOrderServeId, orderServe.getId()));
......@@ -642,14 +639,12 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
List<OrderServeDescribe> orderServeDescribeList = orderServeDescribeMapper.selectByOrderServeId(orderServe.getId());
orderServe.setListOrderServeDescribe(orderServeDescribeList);
});
}
PageInfo<OrderManage> pageInfo = new PageInfo<>(orderManageList);
//7、聚合结果
Map<String, Object> map = new HashMap<>();
map.put("pageInfo", pageInfo);
map.put("orderTimes", pageInfo.getSize());
map.put("pageInfo", page);
map.put("orderTimes", page.getTotal());
map.put("sumPay", this.countSumPay(customerId, gogirlToken.getDepartmentId()));
return map;
......@@ -1074,7 +1069,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
//7、支付用户
Customer payCustomer = customerService.getById(orderManage.getPayUser());
orderManage.setPayCustomer(payCustomer);
return orderManage;
}
}
......
src/main/java/com/gogirl/application/product/serve/BaseProduceService.java
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gogirl.domain.product.serve.BaseFeatures;
import com.gogirl.domain.product.serve.BaseProduce;
import com.gogirl.domain.product.serve.BaseServe;
import java.util.List;
......@@ -21,31 +22,21 @@ public interface BaseProduceService extends IService<BaseProduce> {
* @return 款式详情
*/
BaseProduce getProduceForDetail(Integer id);
/**
* 查询首页新品服务款式
*
* @param customerId 当前登陆用户id 作为点赞表的连接查询条件，可以为空
* @param produceLabelId 款式特性id {@link BaseFeatures}
* @return 款式列表
*/
List<BaseProduce> queryNewServePage(Integer customerId, Integer produceLabelId);
/**
* 分页查询款式列表
*
*
* @param featuresId
* @param featuresId 款式特性id
* @param featuresId 款式特性id
* @param colorSystemId
* @param pageNum
* @param pageSize
* @return
*/
IPage<BaseProduce> queryProducePage(Integer featuresId, Integer serveTypeId , Integer colorSystemId, Integer pageNum, Integer pageSize);
IPage<BaseProduce> queryProducePage(Integer featuresId, Integer serveTypeId, Integer colorSystemId, Integer pageNum, Integer pageSize);
/**
* 点赞款式
*
* @param produceId
*/
void praiseProduce(Integer produceId);
......
src/main/java/com/gogirl/application/product/serve/BaseServeService.java
package com.gogirl.application.product.serve;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gogirl.domain.product.serve.BaseServe;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
......@@ -21,7 +21,7 @@ public interface BaseServeService extends IService<BaseServe> {
* @param serveIdList
* @return
*/
List<BaseServe> listServeForPage(BaseServe param, List<Integer> serveIdList);
IPage<BaseServe> listServeForPage(IPage<BaseServe> page, BaseServe param, List<Integer> serveIdList);
/**
* 查询服务聚合
......@@ -30,6 +30,6 @@ public interface BaseServeService extends IService<BaseServe> {
* @param date
* @return
*/
BaseServe getAggregate(Integer id, LocalDateTime date,Integer departmentId);
BaseServe getAggregate(Integer id, LocalDateTime date, Integer departmentId);
}
src/main/java/com/gogirl/application/product/serve/impl/BaseProduceServiceImpl.java
......@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gogirl.application.product.serve.BaseProduceService;
import com.gogirl.domain.product.serve.BaseFeatures;
import com.gogirl.domain.product.serve.BaseProduce;
import com.gogirl.domain.product.serve.BaseServe;
import com.gogirl.domain.product.serve.PraiseRecord;
import com.gogirl.infrastructure.common.exception.RRException;
import com.gogirl.infrastructure.common.util.ListUtil;
......@@ -38,17 +39,6 @@ public class BaseProduceServiceImpl extends ServiceImpl<BaseProduceMapper, BaseP
@Override
public List<BaseProduce> queryNewServePage(Integer cusId, Integer produceLabelId) {
BaseFeatures baseFeatures = baseFeaturesMapper.selectById(produceLabelId);
//热销款根据销量排序
if (baseFeatures != null && baseFeatures.getName().equals("热销款")) {
return baseProduceMapper.queryHotServePage(cusId, produceLabelId);
}
//其他标签根据款式index_sort排序
return baseProduceMapper.queryNewServePage(cusId, produceLabelId);
}
@Override
public IPage<BaseProduce> queryProducePage(Integer featuresId, Integer serveTypeId, Integer colorSystemId, Integer pageNum, Integer pageSize) {
BaseFeatures baseFeatures = baseFeaturesMapper.selectById(featuresId);
IPage<BaseProduce> page = new Page<>(pageNum, pageSize);
......
src/main/java/com/gogirl/application/product/serve/impl/BaseServeServiceImpl.java
package com.gogirl.application.product.serve.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gogirl.application.product.serve.BaseServeService;
import com.gogirl.domain.market.discount.LeisureDiscountConfig;
import com.gogirl.domain.order.serve.ProducePromotionTime;
import com.gogirl.domain.product.serve.BaseServe;
import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigMapper;
import com.gogirl.infrastructure.mapper.product.serve.BaseServeMapper;
......@@ -25,8 +24,8 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
@Override
public List<BaseServe> listServeForPage(BaseServe param, List<Integer> serveIdList) {
return baseServeMapper.listServeForPage(param, serveIdList);
public IPage<BaseServe> listServeForPage(IPage<BaseServe> page, BaseServe param, List<Integer> serveIdList) {
return baseServeMapper.listServeForPage(page, param, serveIdList);
}
private final ProducePromotionTimeMapper producePromotionTimeMapper;
......
src/main/java/com/gogirl/application/store/store/StoreManageService.java
package com.gogirl.application.store.store;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gogirl.domain.store.store.StoreManage;
......@@ -18,7 +19,7 @@ public interface StoreManageService extends IService<StoreManage> {
* @param param 查询参数
* @return 店铺列表
*/
List<StoreManage> listShopManageForPage(StoreManage param);
IPage<StoreManage> listShopManageForPage(IPage<StoreManage> page, StoreManage param);
/**
* 获取美甲师绑定的店铺
......
src/main/java/com/gogirl/application/store/store/impl/StoreManageServiceImpl.java
......@@ -2,6 +2,7 @@ package com.gogirl.application.store.store.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gogirl.application.store.store.StoreManageService;
import com.gogirl.domain.store.store.StoreGuide;
......@@ -27,8 +28,8 @@ public class StoreManageServiceImpl extends ServiceImpl<StoreManageMapper, Store
private final StoreManageMapper storeManageMapper;
@Override
public List<StoreManage> listShopManageForPage(StoreManage storeManage) {
return storeManageMapper.listShopManageForPage(storeManage);
public IPage<StoreManage> listShopManageForPage(IPage<StoreManage> page, StoreManage storeManage) {
return storeManageMapper.listShopManageForPage(page,storeManage);
}
......
src/main/java/com/gogirl/application/user/customer/CustomerBalanceService.java
package com.gogirl.application.user.customer;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.gogirl.domain.user.customer.CustomerBalance;
import com.gogirl.domain.user.customer.CustomerBalanceRecord;
import com.gogirl.shared.user.command.ConsumerCommand;
......@@ -32,5 +32,5 @@ public interface CustomerBalanceService extends IService<CustomerBalance> {
* @param pageSize 分页长度
* @return 用户消费记录分页查询结果
*/
PageInfo<CustomerBalanceRecord> getBalanceRecordCard(Integer customerId, int pageNum, int pageSize);
IPage<CustomerBalanceRecord> getBalanceRecordCard(Integer customerId, int pageNum, int pageSize);
}
src/main/java/com/gogirl/application/user/customer/impl/CustomerBalanceServiceImpl.java
......@@ -3,9 +3,9 @@ package com.gogirl.application.user.customer.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.gogirl.application.order.serve.OrderManageService;
import com.gogirl.application.user.customer.CustomerBalanceService;
import com.gogirl.domain.order.serve.OrderManage;
......@@ -102,16 +102,16 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
@Override
public PageInfo<CustomerBalanceRecord> getBalanceRecordCard(Integer customerId, int pageNum, int pageSize) {
public IPage<CustomerBalanceRecord> getBalanceRecordCard(Integer customerId, int pageNum, int pageSize) {
CustomerBalanceRecord param = new CustomerBalanceRecord();
param.setCustomerId(customerId);
PageHelper.startPage(pageNum, pageSize);
IPage<CustomerBalanceRecord> page = new Page<>(pageNum, pageSize);
//1、查询消费记录
List<CustomerBalanceRecord> list = balanceRecordDao.getBalanceRecordCard(customerId);
page = balanceRecordDao.getBalanceRecordCard(page, customerId);
//2、如果是预约订单消费，关联查询预约订单
list.stream()
page.getRecords().stream()
.filter(balanceRecord -> balanceRecord.getType().equals(-1))
.forEach(balanceRecord -> {
//消费记录关联的订单
......@@ -130,7 +130,8 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
for (StoreUser storeUser : allStoreUser) {
idMapName.put(String.valueOf(storeUser.getId()), storeUser.getName());
}
for (CustomerBalanceRecord customerBalanceRecord : list) {
//
for (CustomerBalanceRecord customerBalanceRecord : page.getRecords()) {
String refereeId = customerBalanceRecord.getRefereeId();
if (refereeId != null && !refereeId.isEmpty()) {
String[] refereeIdArr = refereeId.split(",");
......@@ -143,7 +144,6 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
customerBalanceRecord.setRefereeId(refereeName.substring(1));
}
}
return new PageInfo<>(list);
return page;
}
}
src/main/java/com/gogirl/domain/user/customer/CustomerBalanceRecord.java
......@@ -24,18 +24,18 @@ import java.util.Date;
public class CustomerBalanceRecord {
public static final Integer TYPE_MALL_ORDER = 3;
//1:充值，2:首次充值，3:商城订单扣款:,-1:预约订单扣款
/*类型：1:充值，2:首次充值，3:商城订单扣款:,-1:预约订单扣款*/
public static final Integer TYPE_CHARGE = 1;
public static final Integer TYPE_FIRST_CHARGE = 2;
public static final Integer TYPE_MALL_ORDER_CONSUME = 3;
public static final Integer TYPE_SCHEDULE_ORDER_CONSUME = -1;
// @ApiModelProperty("钱去到哪里了：1:用户端微信支付,2:会员卡收款,3:其他(目前没用到)," +
// "4:用户端微信支付充值,5:pos收款," +
// "6:现金收款,7:大众点评收款,8:微信扫码支付,9:团购," +
// "10:免单，11:")
/*钱去到哪里了：1:用户端微信支付,2:会员卡收款,3:其他(目前没用到),4:用户端微信支付充值,5:pos收款,6:现金收款,7:大众点评收款,8:微信扫码支付,9:团购,10:免*/
public static final Integer SOURCE_WX = 1;
public static final Integer SOURCE_BALANCE = 2;
public static final Integer SOURCE_OTHER = 3;
@TableId(type = IdType.AUTO)
private Integer id;
......@@ -43,8 +43,7 @@ public class CustomerBalanceRecord {
private Integer customerId;
private Integer oldBalance;
@ApiModelProperty("钱去到哪里了：1:用户端微信支付,2:会员卡收款,3:其他(目前没用到),4:用户端微信支付充值,5:pos收款," +
"6:现金收款,7:大众点评收款,8:微信扫码支付,9:团购,10:免单，11:")
@ApiModelProperty("钱去到哪里了：1:用户端微信支付,2:会员卡收款,3:其他(目前没用到),4:用户端微信支付充值,5:pos收款,6:现金收款,7:大众点评收款,8:微信扫码支付,9:团购,10:免单，11:")
private Integer source;
@ApiModelProperty("这笔记录来自于哪里：1:充值，2:首次充值，3:商城订单扣款:,-1:预约订单扣款")
......@@ -59,19 +58,28 @@ public class CustomerBalanceRecord {
@ApiModelProperty("该笔记录金额")
private Integer orderAmount;
@ApiModelProperty("新版本订单id,原order_id没用了")
private Integer newOrderId;
private Double discount;
@ApiModelProperty("赠送金额")
private Integer bestowAmount;
@ApiModelProperty("关联订单id")
private String orderId;
@ApiModelProperty("订单状态")
private Integer orderState;
private String ip;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("充值推荐人，美甲师id")
private String refereeId;
@ApiModelProperty("店铺id")
private Integer departmentId;
/**
......@@ -79,8 +87,10 @@ public class CustomerBalanceRecord {
*/
@TableField(exist = false)
private StoreUser referee;
@TableField(exist = false)
private String departmentName;
@TableField(exist = false)
@ApiModelProperty("消费订单详情")
private OrderManage orderManage;
......
src/main/java/com/gogirl/infrastructure/mapper/product/serve/BaseProduceMapper.java
......@@ -7,8 +7,6 @@ import com.gogirl.domain.product.serve.BaseProduce;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* Created by yinyong on 2018/8/23.
*/
......@@ -16,22 +14,14 @@ import java.util.List;
@Repository
public interface BaseProduceMapper extends BaseMapper<BaseProduce> {
int insertProduceServe(@Param("serveId") Integer serveId, @Param("id") Integer id);
/**
* 通过resultMap获取款式详情
*
* @param id id
* @return 款式详情
*/
BaseProduce getProduceForDetail(Integer id);
int updateProduceServe(BaseProduce baseProduce);
int updateProduceById(BaseProduce baseProduce);
@Deprecated
List<BaseProduce> queryNewServePage(@Param("customerId") Integer customerId,
@Param("produceLabelId") Integer produceLabelId);
@Deprecated
List<BaseProduce> queryHotServePage(@Param("customerId") Integer customerId,
@Param("produceLabelId") Integer produceLabelId);
/**
* 分页查询款式
*
......
src/main/java/com/gogirl/infrastructure/mapper/product/serve/BaseServeMapper.java
package com.gogirl.infrastructure.mapper.product.serve;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.gogirl.domain.product.serve.BaseServe;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
......@@ -15,7 +15,7 @@ import java.util.List;
@Repository
public interface BaseServeMapper extends BaseMapper<BaseServe> {
List<BaseServe> listServeForPage(@Param("baseServe") BaseServe baseServe, @Param("serveIdList") List<Integer> serveIdList);
IPage<BaseServe> listServeForPage(@Param("page") IPage<BaseServe> page, @Param("baseServe") BaseServe baseServe, @Param("serveIdList") List<Integer> serveIdList);
List<BaseServe> listLeisureServeForPage(@Param("baseServe") BaseServe baseServe, @Param("serveIdList") List<Integer> serveIdList, @Param("time") String time, @Param("week") Integer week);
......
src/main/java/com/gogirl/infrastructure/mapper/store/store/StoreManageMapper.java
......@@ -2,7 +2,9 @@ package com.gogirl.infrastructure.mapper.store.store;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.gogirl.domain.store.store.StoreManage;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
......@@ -14,15 +16,20 @@ import java.util.List;
@Repository
public interface StoreManageMapper extends BaseMapper<StoreManage> {
List<StoreManage> listShopManageForPage(StoreManage storeManage);
StoreManage getShopManageForDetail(Integer id);
/**
* 分页获取店铺列表
*
* @param page
* @param storeManage
* @return
*/
IPage<StoreManage> listShopManageForPage(IPage<StoreManage> page, @Param("storeManage") StoreManage storeManage);
/**
* 获取美甲师绑定的店铺列表
*
* @param technicianId
* @return
* @param technicianId 美甲师id
* @return list
*/
List<StoreManage> getTechnicianShopList(Integer technicianId);
}
src/main/java/com/gogirl/infrastructure/mapper/user/customer/CustomerBalanceRecordMapper.java
package com.gogirl.infrastructure.mapper.user.customer;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gogirl.domain.user.customer.CustomerBalanceRecord;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
......@@ -11,21 +13,31 @@ import java.util.List;
@Repository
public interface CustomerBalanceRecordMapper extends BaseMapper<CustomerBalanceRecord> {
int insertSelective(CustomerBalanceRecord record);
CustomerBalanceRecord selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(CustomerBalanceRecord record);
CustomerBalanceRecord selectByOrderId(String orderId);
List<CustomerBalanceRecord> getBalanceRecord(CustomerBalanceRecord customerBalanceRecord);
/**
* 根据日期获取充值记录id和推荐人和店铺
*
* @param day 日期形如2020-03-03
* @return list
*/
List<CustomerBalanceRecord> getXcxChargeRecord(String day);
List<CustomerBalanceRecord> listPartPay(Integer orderId);
List<CustomerBalanceRecord> getBalanceRecordCard(Integer customerId);
/**
* 查询会员卡消费记录
*
* @param customerId 会员ID
* @return 记录
*/
IPage<CustomerBalanceRecord> getBalanceRecordCard(@Param("page") IPage<CustomerBalanceRecord> page, @Param("customerId") Integer customerId);
/**
* 分页查询充值业绩
*
* @param page page
* @param technicianId 美甲师id
* @param month 月份形如2020-04
* @return page
*/
Page<CustomerBalanceRecord> queryPageAchieve(Page<CustomerBalanceRecord> page, @Param("technicianId") Integer technicianId, @Param("month") String month);
Page<CustomerBalanceRecord> queryPageAchieve(Page<CustomerBalanceRecord> page, Integer technicianId, String month);
}
src/main/java/com/gogirl/infrastructure/schedule/Schedule.java
......@@ -150,7 +150,7 @@ public class Schedule {
//推荐人id
StringBuilder referee_ids = new StringBuilder();
//充值记录
CustomerBalanceRecord cbrt = balanceRecordDao.selectByPrimaryKey(customerBalanceRecord.getId());
CustomerBalanceRecord cbrt = balanceRecordDao.selectById(customerBalanceRecord.getId());
//每次都修改推荐人,且每晚都会设置推荐人
if (customerBalanceRecord.getRefereeId() != null) {
String[] arr = customerBalanceRecord.getRefereeId().split(",");
......@@ -174,7 +174,7 @@ public class Schedule {
if (customerBalanceRecord.getId() != null
&& (customerBalanceRecord.getRefereeId() != null || customerBalanceRecord.getDepartmentId() != null)) {
balanceRecordDao.updateByPrimaryKeySelective(customerBalanceRecord);
balanceRecordDao.updateById(customerBalanceRecord);
}
}
log.debug("每天晚上11:50定时设置当天服务的技师为推荐人** 任务结束");
......
src/main/java/com/gogirl/infrastructure/util/AESUtil.java
......@@ -12,9 +12,9 @@ import java.security.Security;
import java.security.spec.InvalidParameterSpecException;
/**
* AES加密
* AES加密解密工具类
*
* @author liuyazhuang
* @author robbendev
*/
public class AESUtil {
......
src/main/java/com/gogirl/infrastructure/util/BASE64DecodedMultipartFile.java → src/main/java/com/gogirl/infrastructure/util/BASE64DecodedMultipartFileUtil.java
......@@ -5,12 +5,12 @@ import sun.misc.BASE64Decoder;
import java.io.*;
public class BASE64DecodedMultipartFile implements MultipartFile {
public class BASE64DecodedMultipartFileUtil implements MultipartFile {
private final byte[] imgContent;
private final String header;
public BASE64DecodedMultipartFile(byte[] imgContent, String header) {
public BASE64DecodedMultipartFileUtil(byte[] imgContent, String header) {
this.imgContent = imgContent;
this.header = header.split(";")[0];
}
......@@ -55,20 +55,26 @@ public class BASE64DecodedMultipartFile implements MultipartFile {
new FileOutputStream(dest).write(imgContent);
}
/**
* base64字符串转MultipartFile
*
* @param base64 base64字符串
* @return MultipartFile
*/
public static MultipartFile base64ToMultipart(String base64) {
try {
String[] baseStrs = base64.split(",");
String[] baseStr = base64.split(",");
BASE64Decoder decoder = new BASE64Decoder();
byte[] b = new byte[0];
b = decoder.decodeBuffer(baseStrs[1]);
byte[] b;
b = decoder.decodeBuffer(baseStr[1]);
for (int i = 0; i < b.length; ++i) {
if (b[i] < 0) {
b[i] += 256;
}
}
return new BASE64DecodedMultipartFile(b, baseStrs[0]);
return new BASE64DecodedMultipartFileUtil(b, baseStr[0]);
} catch (IOException e) {
e.printStackTrace();
return null;
......
src/main/java/com/gogirl/infrastructure/util/math/Prefix.java → src/main/java/com/gogirl/infrastructure/util/PrefixUtil.java
package com.gogirl.infrastructure.util.math;
package com.gogirl.infrastructure.util;
import java.util.ArrayList;
import java.util.Collection;
......@@ -8,48 +8,52 @@ import java.util.stream.Stream;
/**
* Java8求笛卡尔积
*
* @param <T>
*/
public class Prefix<T> {
private final T value;
private final Prefix<T> parent;
private Prefix(Prefix<T> parent, T value) {
this.parent = parent;
this.value = value;
}
private static <T, C extends Collection<T>> Stream<C> comb(
List<? extends Collection<T>> values, int offset, Prefix<T> prefix,
Supplier<C> supplier) {
if (offset == values.size() - 1)
return values.get(offset).stream()
.map(e -> new Prefix<>(prefix, e).addTo(supplier.get()));
return values.get(offset).stream()
.flatMap(e -> comb(values, offset + 1, new Prefix<>(prefix, e), supplier));
}
public class PrefixUtil {
/**
* 求笛卡尔积
*
* @param values 带求集合
* @param supplier 结果容器
* @param <T>
* @param <C>
* @return
* @param <T> T
* @param <C> C
* @return result
*/
public static <T, C extends Collection<T>> Stream<C> ofCombinations(Collection<? extends Collection<T>> values, Supplier<C> supplier) {
if (values.isEmpty())
return Stream.empty();
return comb(new ArrayList<>(values), 0, null, supplier);
return Prefix.comb(new ArrayList<>(values), 0, null, supplier);
}
// put the whole prefix into given collection
private <C extends Collection<T>> C addTo(C collection) {
if (parent != null)
parent.addTo(collection);
collection.add(value);
return collection;
static final class Prefix<T> {
private final T value;
private final Prefix<T> parent;
private Prefix(Prefix<T> parent, T value) {
this.parent = parent;
this.value = value;
}
private static <T, C extends Collection<T>> Stream<C> comb(
List<? extends Collection<T>> values, int offset, Prefix<T> prefix,
Supplier<C> supplier) {
if (offset == values.size() - 1)
return values.get(offset).stream()
.map(e -> new Prefix<>(prefix, e).addTo(supplier.get()));
return values.get(offset).stream()
.flatMap(e -> comb(values, offset + 1, new Prefix<>(prefix, e), supplier));
}
// put the whole prefix into given collection
private <C extends Collection<T>> C addTo(C collection) {
if (parent != null)
parent.addTo(collection);
collection.add(value);
return collection;
}
}
}
src/main/java/com/gogirl/infrastructure/util/QRCodeImg.java deleted 100644 → 0
package com.gogirl.infrastructure.util;//package com.gogirl.wxappmember.infrastructure.util;
//
//
//import jp.sourceforge.qrcode.data.QRCodeImage;
//
//import java.awt.image.BufferedImage;
//
//public class QRCodeImg implements QRCodeImage {
// BufferedImage bufImg;
//
// public QRCodeImg(BufferedImage bufImg) {
// this.bufImg = bufImg;
// }
//
// @Override
// public int getHeight() {
// return bufImg.getHeight();
// }
//
// @Override
// public int getPixel(int x, int y) {
// return bufImg.getRGB(x, y);
// }
//
// @Override
// public int getWidth() {
// return bufImg.getWidth();
// }
//}
src/main/java/com/gogirl/infrastructure/util/TreeUtils.java
......@@ -8,16 +8,16 @@ import java.util.List;
/**
* 树结构工具类
*
* @author mochunrun
* @author robbendev
*/
public class TreeUtils {
/**
* 方法二、
* 商品分类列表转成树形接口
*
* @param list
* @return
* @param list 商品分类列表
* @return 商品分类树🌲
*/
public static List<MallCategory> listToTree(List<MallCategory> list) {
//用递归找子。
......
src/main/java/com/gogirl/interfaces/product/serve/ProduceController.java
package com.gogirl.interfaces.product.serve;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gogirl.application.product.serve.BaseProduceService;
import com.gogirl.domain.product.serve.BaseProduce;
import com.gogirl.domain.product.serve.BaseServe;
......@@ -26,42 +25,6 @@ public class ProduceController {
private final BaseProduceService baseProduceService;
@Deprecated
@GetMapping("/customer/serve/no_queryNewServePage")
@ApiOperation(value = "款式列表")
public JsonResult<PageInfo<BaseServe>> no_queryNewServePage(@RequestParam String token,
@RequestParam(required = false) Integer labelId,
@RequestParam(required = false) Integer serveLabelId,
@RequestParam(required = false) Integer pageNum,
@RequestParam(required = false) Integer pageSize) {
GogirlToken gogirlToken = SessionUtils.getCustomerToken();
if (labelId != null && labelId == -1) {
labelId = null;
}
//分页
if (pageNum != null && pageSize != null) {
PageHelper.startPage(pageNum, pageSize);
}
//是否登陆
Integer customerId = (gogirlToken != null && gogirlToken.getCustomerId() != null) ? gogirlToken.getCustomerId() : null;
long time = System.currentTimeMillis();
List<BaseProduce> listsBaseProduce = baseProduceService.queryNewServePage(customerId, labelId);
System.out.println("queryNewServePage db io time " + (+System.currentTimeMillis() - time));
List<BaseServe> lists = listsBaseProduce.stream()
.map(baseProduce -> {
BaseServe item = baseProduce.getServe();
baseProduce.setServe(null);
item.setProduce(baseProduce);
return item;
})
.collect(Collectors.toList());
return JsonResult.success(new PageInfo<>(lists));
}
@GetMapping("/customer/serve/no_queryProducePage")
@ApiOperation(value = "款式列表")
......
src/main/java/com/gogirl/interfaces/product/serve/ServeController.java
package com.gogirl.interfaces.product.serve;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gogirl.application.product.serve.BaseProduceService;
import com.gogirl.application.product.serve.BaseServeService;
import com.gogirl.application.xcx.GogirlTokenService;
import com.gogirl.domain.product.serve.BaseServe;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.common.util.StringUtils;
import com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigMapper;
import com.gogirl.infrastructure.mapper.product.serve.BaseServeMapper;
import com.gogirl.infrastructure.mapper.product.serve.PraiseRecordMapper;
import com.google.common.collect.Lists;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
......@@ -20,11 +18,6 @@ import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@RestController
@Api(tags = {"预约服务接口"}, value = "预约服务接口")
......@@ -51,44 +44,6 @@ public class ServeController {
return JsonResult.success(baseServe);
}
@ApiOperation(value = "查看服务列表")
@GetMapping("/customer/serve/no_queryServeForPage")
@Deprecated
public JsonResult<PageInfo<BaseServe>> no_queryServeForPage(BaseServe param,
Integer pageNum,
Integer pageSize,
Integer labelId,
String serveIds,
String time) {
if (pageNum != null && pageSize != null) {
PageHelper.startPage(pageNum, pageSize);
}
if (labelId != null && labelId == -1) {
labelId = null;
}
List<Integer> serveIdList;
if (StringUtils.isNotEmpty(serveIds)) {
serveIdList = Lists.newArrayList(serveIds.split(",")).stream().map(Integer::valueOf).collect(Collectors.toList());
} else {
serveIdList = new ArrayList<>();
}
Date today = new Date();
Calendar c = Calendar.getInstance();
c.setTime(today);
int weekday = c.get(Calendar.DAY_OF_WEEK);
if (weekday == 1) weekday = 7;
else weekday = weekday - 1;
param.setServeLabelId(labelId);
List<BaseServe> baseServeList;
if (StringUtils.isEmpty(time))
baseServeList = baseServeService.listServeForPage(param, serveIdList);
else
baseServeList = baseServeMapper.listLeisureServeForPage(param, serveIdList, time, weekday);
return JsonResult.success(new PageInfo<>(baseServeList));
}
@ApiOperation(value = "查看服务详情")
@GetMapping("/technician/serve/getServeDetail")
......@@ -103,15 +58,13 @@ public class ServeController {
@RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/technician/serve/queryServeForPage")
@ApiOperation(value = "查询服务款式", notes = "查看服务列表")
public JsonResult<PageInfo<BaseServe>> queryServeForPage(BaseServe baseServe,
@RequestParam(required = false) Integer pageNum,
@RequestParam(required = false) Integer pageSize) {
if (pageNum != null && pageSize != null) {
PageHelper.startPage(pageNum, pageSize);
}
List<BaseServe> lists = baseServeService.listServeForPage(baseServe, null);
PageInfo<BaseServe> pageInfo = new PageInfo<>(lists);
return JsonResult.success(pageInfo);
public JsonResult<IPage<BaseServe>> queryServeForPage(BaseServe baseServe,
@RequestParam(required = false, defaultValue = "1") Integer pageNum,
@RequestParam(required = false, defaultValue = "20") Integer pageSize) {
IPage<BaseServe> page = new Page<>(pageNum, pageSize);
page = baseServeService.listServeForPage(page, baseServe, null);
return JsonResult.success(page);
}
}
src/main/java/com/gogirl/interfaces/store/ShopManageController.java
package com.gogirl.interfaces.store;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gogirl.application.store.store.StoreManageService;
import com.gogirl.application.xcx.GogirlTokenService;
import com.gogirl.domain.store.store.StoreManage;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
import com.gogirl.infrastructure.util.MapDistance;
import com.gogirl.shared.store.query.dto.StoreManageDTO;
import com.google.common.collect.Lists;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -39,27 +38,28 @@ public class ShopManageController {
@ApiOperation(value = "查询店铺列表，longitude,latitude和页码都是可选参数")
@GetMapping("/customer/shop/queryShopForPage")
public JsonResult<PageInfo<StoreManage>> queryShopForPage(@RequestParam(required = false) String longitude,
@RequestParam(required = false) String latitude,
@RequestParam(required = false) Integer pageNum,
@RequestParam(required = false) Integer pageSize) {
if (pageNum != null && pageSize != null) {
PageHelper.startPage(pageNum, pageSize);
}
public JsonResult<IPage<StoreManage>> queryShopForPage(@RequestParam(required = false) String longitude,
@RequestParam(required = false) String latitude,
@RequestParam(required = false, defaultValue = "1") Integer pageNum,
@RequestParam(required = false, defaultValue = "20") Integer pageSize) {
IPage<StoreManage> page = new Page<>(pageNum, pageSize);
StoreManage pageReq = new StoreManage();
pageReq.setLongitude(longitude);
pageReq.setLatitude(latitude);
List<StoreManage> lists = storeManageService.listShopManageForPage(pageReq);
page = storeManageService.listShopManageForPage(page, pageReq);
if (StringUtils.isNotBlank(longitude) && StringUtils.isNotBlank(latitude) && !longitude.equals("undefined") && !latitude.equals("undefined")) {
if (StringUtils.isNotBlank(longitude) &&
StringUtils.isNotBlank(latitude) &&
!longitude.equals("undefined") && !latitude.equals("undefined")) {
for (StoreManage storeManage : lists) {
for (StoreManage storeManage : page.getRecords()) {
Double distance = MapDistance.getDistance(longitude, latitude, storeManage.getLongitude(), storeManage.getLatitude());
storeManage.setDistance(distance);
}
lists.sort(Comparator.comparing(StoreManage::getDistance));
page.getRecords().sort(Comparator.comparing(StoreManage::getDistance));
}
return JsonResult.success(new PageInfo<>(lists));
return JsonResult.success(page);
}
@ApiOperation(value = "id查店铺详情")
......@@ -67,7 +67,7 @@ public class ShopManageController {
public JsonResult<StoreManage> queryShopForDetail(@RequestParam(required = false) String longitude,
@RequestParam(required = false) String latitude,
@RequestParam(required = false) Integer id) {
StoreManage storeManage=storeManageService.getShopManageForDetail(id,longitude,latitude);
StoreManage storeManage = storeManageService.getShopManageForDetail(id, longitude, latitude);
return JsonResult.success(storeManage);
......@@ -81,7 +81,7 @@ public class ShopManageController {
StoreManage storeManage = new StoreManage();
storeManage.setId(departmentId);
List<StoreManage> lists = storeManageService.listShopManageForPage(storeManage);
List<StoreManage> lists = storeManageService.listShopManageForPage(new Page<>(1, 10), storeManage).getRecords();
List<String> resultList = lists.stream()
.filter(Objects::nonNull)
......
src/main/java/com/gogirl/interfaces/user/CouponCustomerRelevanceController.java
package com.gogirl.interfaces.user;
import com.github.pagehelper.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.gogirl.application.market.CouponCustomerRelevanceService;
import com.gogirl.application.market.CouponService;
import com.gogirl.application.market.MarketService;
......@@ -43,14 +43,20 @@ public class CouponCustomerRelevanceController {
@ApiOperation(value = "我的优惠券列表")
@GetMapping("/customer/getMyCoupon")
public JsonResult<PageInfo<CouponCustomerRelevance>> getMyCoupon(String token,
Integer pageNum,
Integer pageSize,
Integer state,
Boolean containRemoveCoupon) {
public JsonResult<IPage<CouponCustomerRelevance>> getMyCoupon(String token,
Integer pageNum,
Integer pageSize,
Integer state,
Boolean containRemoveCoupon) {
Integer customerId = SessionUtils.getCustomerId();
log.info("查询领取优惠券的用户列表CouponCustomerRelevance:" + customerId.toString());
PageInfo<CouponCustomerRelevance> pageInfo = couponCustomerRelevanceService.selectMyCoupon(customerId, pageNum, pageSize, state, containRemoveCoupon);
if (pageNum == null) {
pageNum = 1;
}
if (pageSize == null) {
pageSize = 20;
}
IPage<CouponCustomerRelevance> pageInfo = couponCustomerRelevanceService.selectMyCoupon(customerId, pageNum, pageSize, state, containRemoveCoupon);
return JsonResult.success(pageInfo);
}
......
src/main/java/com/gogirl/interfaces/xcx/PayController.java
package com.gogirl.interfaces.xcx;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.pagehelper.PageInfo;
import com.gogirl.application.market.DiscountConfigService;
import com.gogirl.application.order.member.IChargeOrderService;
import com.gogirl.application.order.serve.OrderManageService;
......@@ -163,10 +163,10 @@ public class PayController {
@ApiOperation(value = "查看消费记录")
@GetMapping("/customer/pay/getBalanceRecordCard")
public JsonResult<PageInfo<CustomerBalanceRecord>> getBalanceRecordCard(Integer customerId,
int pageNum,
int pageSize) {
PageInfo<CustomerBalanceRecord> pageInfo = balanceService.getBalanceRecordCard(customerId, pageNum, pageSize);
public JsonResult<IPage<CustomerBalanceRecord>> getBalanceRecordCard(Integer customerId,
int pageNum,
int pageSize) {
IPage<CustomerBalanceRecord> pageInfo = balanceService.getBalanceRecordCard(customerId, pageNum, pageSize);
return JsonResult.success(pageInfo);
}
......
src/main/java/com/gogirl/interfaces/xcx/XcxController.java
......@@ -9,7 +9,7 @@ import com.gogirl.domain.user.customer.Customer;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.config.property.GogirlProperties;
import com.gogirl.infrastructure.mapper.user.customer.CustomerMapper;
import com.gogirl.infrastructure.util.BASE64DecodedMultipartFile;
import com.gogirl.infrastructure.util.BASE64DecodedMultipartFileUtil;
import com.gogirl.infrastructure.util.ImageUtil;
import com.gogirl.shared.user.query.qry.CustomerQuery;
import io.swagger.annotations.Api;
......@@ -103,7 +103,7 @@ public class XcxController {
@PostMapping("/customer/xcx/no_base64Upload")
public JsonResult<String> base64Upload(@RequestBody String base64) throws Exception {
log.info("图片上传");
MultipartFile multipartFile = BASE64DecodedMultipartFile.base64ToMultipart(base64);
MultipartFile multipartFile = BASE64DecodedMultipartFileUtil.base64ToMultipart(base64);
String imgUrl = ImageUtil.saveImage(gogirlProperties.getPicturePath(), multipartFile);
return JsonResult.success(imgUrl);
}
......
src/main/resources/mapper/product/BaseProduceMapper.xml
......@@ -81,58 +81,6 @@
</select>
<insert id="insertProduceServe">
insert into base_produce_serve
(serve_id, produce_id)
values (#{serveId}, #{id})
</insert>
<select id="queryNewServePage" resultMap="produceResultMap">
select
<include refid="serveSql"/>,
<if test="customerId != null">
<include refid="praiseSql"/>,
</if>
<include refid="produceSql"/>
from base_serve ser
left join base_produce produce on produce.service_id = ser.id
<if test="produceLabelId != null">
left join features_mapping t2 on t2.data_type=2 and t2.data_id=produce.id
</if>
<if test="customerId != null">
left join praise_record praise on produce.id=praise.serve_id and praise.customer_id =#{customerId}
</if>
where produce.has_index_show = 1 and ser.status =1 and produce.status=1
<if test="produceLabelId != null">
and t2.features_id =#{produceLabelId}
</if>
order by produce.index_sort desc
</select>
<select id="queryHotServePage" resultMap="produceResultMap">
select
<include refid="serveSql"/>,
<if test="customerId != null">
<include refid="praiseSql"/>,
</if>
<include refid="produceSql"/>
from base_serve ser
left join base_produce produce on produce.service_id = ser.id
<if test="produceLabelId != null">
left join features_mapping t2 on t2.data_type=2 and t2.data_id=produce.id
left join produce_sales t3 on produce.id =t3.produce_id
</if>
<if test="customerId != null">
left join praise_record praise on produce.id=praise.serve_id and praise.customer_id =#{customerId}
</if>
where produce.has_index_show = 1 and ser.status =1 and produce.status=1
<if test="produceLabelId != null">
and t2.features_id =#{produceLabelId}
</if>
order by t3.sales desc
</select>
<select id="queryProducePage" resultType="com.gogirl.domain.product.serve.BaseProduce">
select * from base_produce t1
<if test="featuresId !=null ">
......@@ -161,48 +109,5 @@
</choose>
</select>
<update id="updateProduceServe">
update base_produce_serve
set serve_id = #{serviceId}
where produce_id = #{id}
</update>
<update id="updateProduceById">
update base_produce
<set>
<if test="name != null">
name = #{name},
</if>
<if test="picturePath != null">
picture_path = #{picturePath},
</if>
<if test="type != null">
type = #{type},
</if>
<if test="label != null">
label = #{label},
</if>
<if test="shopSort != null">
shop_sort = #{shopSort},
</if>
<if test="reqGrade != null">
req_grade = #{reqGrade},
</if>
<if test="remark != null">
remark = #{remark},
</if>
<if test="status != null">
status = #{status},
</if>
<if test="details != null">
details = #{details},
</if>
<if test="praiseSum != null">
praise_sum = #{praiseSum},
</if>
update_time = now()
</set>
where
id = #{id}
</update>
</mapper>
src/main/resources/mapper/store/StoreManageMapper.xml
......@@ -4,45 +4,31 @@
<mapper namespace="com.gogirl.infrastructure.mapper.store.store.StoreManageMapper">
<sql id="baseSql">
id, store_no, logo, name, longitude, latitude, address, master, employee_number employeeNumber, customer_service_telphone customerServiceTelphone, contact_name contactName, contact_telphone contactTelphone, remark, business_day businessDay, business_start_time businessStartTime, business_end_time businessEndTime,shop_environment_photos shopEnvironmentPhotos,short_code shortCode
</sql>
<sql id="storeByServeIdSql">
sm.id sm_id, sm.store_no sm_store_no, sm.logo sm_logo, sm.name sm_name, sm.longitude sm_longitude, sm.latitude sm_latitude, sm.address sm_address, sm.master sm_master, sm.employee_number sm_employee_number, sm.customer_service_telphone sm_customer_service_telphone, sm.contact_name sm_contact_name, sm.contact_telphone sm_contact_telphone, sm.remark sm_remark, sm.business_day sm_business_day, sm.business_start_time sm_business_start_time, sm.business_end_time sm_business_end_time,sm.shop_environment_photos sm_shop_environment_photos
</sql>
<select id="getTechnicianShopList" resultType="com.gogirl.domain.store.store.StoreManage">
SELECT t3.*
from store_technician t1
LEFT JOIN staff_store_authority t2 on t1.user_id = t2.user_id
LEFT JOIN store_manage t3 on t2.store_id = t3.id
where t1.id = #{technicianId}
</select>
<select id="listShopManageForPage" resultType="com.gogirl.domain.store.store.StoreManage">
select
<include refid="baseSql"/>
*
from store_manage
where operating_status = 1
<if test="id != null">
and id = #{id}
<if test="storeManage.id != null">
and id = #{storeManage.id}
</if>
<if test="name != null and name != '' ">
and name like '%${name}%'
<if test="storeManage.name != null and storeManage.name != '' ">
and name like '%${storeManage.name}%'
</if>
<if test="address != null and address != ''">
and address = #{address}
<if test="storeManage.address != null and storeManage.address != ''">
and address = #{storeManage.address}
</if>
<if test="master != null and master != ''">
and master = #{master}
<if test="storeManage.master != null and storeManage.master != ''">
and master = #{storeManage.master}
</if>
</select>
<select id="getShopManageForDetail" resultType="com.gogirl.domain.store.store.StoreManage">
select
<include refid="baseSql"/>
from store_manage
where
id = #{id}
</select>
<select id="getTechnicianShopList" resultType="com.gogirl.domain.store.store.StoreManage">
SELECT t3.* from store_technician t1
LEFT JOIN staff_store_authority t2 on t1.user_id = t2.user_id
LEFT JOIN store_manage t3 on t2.store_id =t3.id
where t1.id= #{technicianId}
</select>
</mapper>
src/main/resources/mapper/user/CustomerBalanceRecordMapper.xml
......@@ -35,76 +35,8 @@
order_id, order_state, ip, cr.remark,referee_id,department_id,store_manage.name as department_name
</sql>
<select id="listPartPay" resultMap="BaseResultMap" parameterType="java.lang.Integer">
select
<include refid="Base_Column_List"/>
from customer_balance_record cr
left join store_manage on store_manage.id = department_id
where order_id = #{orderId}
</select>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
select
<include refid="Base_Column_List"/>
from customer_balance_record cr
left join store_manage on store_manage.id = department_id
where cr.id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByOrderId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from customer_balance_record cr
left join store_manage on store_manage.id = department_id
where order_id = #{orderId,jdbcType=VARCHAR} order by time DESC limit 1
</select>
<select id="getBalanceRecord" resultMap="BaseResultMap"
parameterType="com.gogirl.domain.user.customer.CustomerBalanceRecord">
select
<include refid="Base_Column_List"/>
from customer_balance_record cr
left join store_manage on store_manage.id = department_id
<where>
<if test="customerId != null">
customer_id = #{customerId,jdbcType=INTEGER}
</if>
<if test="source != null">
and source = #{source,jdbcType=INTEGER}
</if>
<if test="type != null">
and type = #{type,jdbcType=INTEGER}
</if>
<if test="time != null">
and time = #{time,jdbcType=TIMESTAMP}
</if>
<if test="currentBalance != null">
and current_balance = #{currentBalance,jdbcType=INTEGER}
</if>
<if test="orderAmount != null">
and order_amount = #{orderAmount,jdbcType=INTEGER}
</if>
<if test="discount != null">
and discount = #{discount,jdbcType=DOUBLE}
</if>
<if test="bestowAmount != null">
and bestow_amount = #{bestowAmount,jdbcType=INTEGER}
</if>
<if test="orderId != null">
and order_id = #{orderId,jdbcType=VARCHAR}
</if>
<if test="orderState != null">
and order_state = #{orderState,jdbcType=INTEGER}
</if>
<if test="ip != null">
and ip = #{ip,jdbcType=VARCHAR}
</if>
<if test="refereeId != null">
and referee_id = #{refereeId,jdbcType=INTEGER}
</if>
</where>
order by time DESC
</select>
<select id="getBalanceRecordCard" resultMap="BaseResultMap"
parameterType="com.gogirl.domain.user.customer.CustomerBalanceRecord">
......@@ -120,158 +52,6 @@
order by t1.time desc
</select>
<insert id="insertSelective" parameterType="com.gogirl.domain.user.customer.CustomerBalanceRecord">
insert into customer_balance_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="customerId != null">
customer_id,
</if>
<if test="source != null">
source,
</if>
<if test="type != null">
type,
</if>
<if test="time != null">
time,
</if>
<if test="currentBalance != null">
current_balance,
</if>
<if test="orderAmount != null">
order_amount,
</if>
<if test="discount != null">
discount,
</if>
<if test="bestowAmount != null">
bestow_amount,
</if>
<if test="orderId != null">
order_id,
</if>
<if test="orderState != null">
order_state,
</if>
<if test="ip != null">
ip,
</if>
<if test="remark != null">
remark,
</if>
<if test="refereeId != null">
referee_id,
</if>
<if test="departmentId != null">
department_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="customerId != null">
#{customerId,jdbcType=INTEGER},
</if>
<if test="source != null">
#{source,jdbcType=INTEGER},
</if>
<if test="type != null">
#{type,jdbcType=INTEGER},
</if>
<if test="time != null">
#{time,jdbcType=TIMESTAMP},
</if>
<if test="currentBalance != null">
#{currentBalance,jdbcType=INTEGER},
</if>
<if test="orderAmount != null">
#{orderAmount,jdbcType=INTEGER},
</if>
<if test="discount != null">
#{discount,jdbcType=DOUBLE},
</if>
<if test="bestowAmount != null">
#{bestowAmount,jdbcType=INTEGER},
</if>
<if test="orderId != null">
#{orderId,jdbcType=VARCHAR},
</if>
<if test="orderState != null">
#{orderState,jdbcType=INTEGER},
</if>
<if test="ip != null">
#{ip,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="refereeId != null">
#{refereeId,jdbcType=INTEGER},
</if>
<if test="departmentId != null">
#{departmentId,jdbcType=INTEGER},
</if>
</trim>
<selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
SELECT @@IDENTITY AS id
</selectKey>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gogirl.domain.user.customer.CustomerBalanceRecord">
update customer_balance_record
<set>
<if test="customerId != null">
customer_id = #{customerId,jdbcType=INTEGER},
</if>
<if test="departmentId != null">
department_id = #{departmentId,jdbcType=INTEGER},
</if>
<if test="source != null">
source = #{source,jdbcType=INTEGER},
</if>
<if test="type != null">
type = #{type,jdbcType=INTEGER},
</if>
<if test="time != null">
time = #{time,jdbcType=TIMESTAMP},
</if>
<if test="currentBalance != null">
current_balance = #{currentBalance,jdbcType=INTEGER},
</if>
<if test="orderAmount != null">
order_amount = #{orderAmount,jdbcType=INTEGER},
</if>
<if test="discount != null">
discount = #{discount,jdbcType=DOUBLE},
</if>
<if test="bestowAmount != null">
bestow_amount = #{bestowAmount,jdbcType=INTEGER},
</if>
<if test="orderId != null">
order_id = #{orderId,jdbcType=VARCHAR},
</if>
<if test="orderState != null">
order_state = #{orderState,jdbcType=INTEGER},
</if>
<if test="ip != null">
ip = #{ip,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="refereeId != null">
referee_id = #{refereeId,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<select id="getXcxChargeRecord" resultMap="BaseResultMap" parameterType="java.lang.String">
select cbr.id,
......
src/test/java/com/gogirl/Test.java
......@@ -292,7 +292,7 @@ public class Test {
//推荐人id
StringBuilder referee_ids = new StringBuilder();
//充值记录
CustomerBalanceRecord cbrt = customerBalanceRecordMapper.selectByPrimaryKey(customerBalanceRecord.getId());
CustomerBalanceRecord cbrt = customerBalanceRecordMapper.selectById(customerBalanceRecord.getId());
//每次都修改推荐人,且每晚都会设置推荐人
if (customerBalanceRecord.getRefereeId() != null) {
String[] arr = customerBalanceRecord.getRefereeId().split(",");
......@@ -315,14 +315,13 @@ public class Test {
}
if (customerBalanceRecord.getId() != null
&& (customerBalanceRecord.getRefereeId() != null || customerBalanceRecord.getDepartmentId() != null)) {
customerBalanceRecordMapper.updateByPrimaryKeySelective(customerBalanceRecord);
customerBalanceRecordMapper.updateById(customerBalanceRecord);
}
}
log.debug("每天晚上11:50定时设置当天服务的技师为推荐人** 任务结束");
}
@Resource
PurchaseStockMapper purchaseStockMapper;
@Resource
......@@ -355,7 +354,5 @@ public class Test {
purchaseStockRecordMapper.insert(purchaseStockRecord);
});
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment