hurui
/
puhui-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

/1

Browse Source
master
袁野 3 months ago
parent 6a97be196f
commit 767196f24e
20 changed files with 23 additions and 74 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      bweb/src/main/java/com/bweb/controller/BsUserController.java
  2. 4
      cweb/src/main/java/com/cweb/controller/CommonController.java
  3. 4
      cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java
  4. 4
      cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java
  5. 2
      cweb/src/main/resources/prod/logback.xml
  6. 3
      order/src/main/java/com/order/controller/business/BsOrderCinemaController.java
  7. 2
      order/src/main/java/com/order/controller/business/BsOrderGoodsController.java
  8. 2
      order/src/main/resources/dev/logback.xml
  9. 2
      order/src/main/resources/prod/logback.xml
  10. 4
      service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java
  11. 9
      service/src/main/java/com/hfkj/qianzhu/CinemaService.java
  12. 2
      service/src/main/java/com/hfkj/qianzhu/KfcService.java
  13. 2
      service/src/main/java/com/hfkj/qianzhu/QianZhuService.java
  14. 3
      service/src/main/java/com/hfkj/qianzhu/StarbucksService.java
  15. 2
      service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java
  16. 10
      service/src/main/java/com/hfkj/service/order/OrderCreateService.java
  17. 5
      service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java
  18. 10
      service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java
  19. 4
      service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java
  20. 7
      service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java

16
bweb/src/main/java/com/bweb/controller/BsUserController.java
Unescape View File

@ -65,22 +65,6 @@ public class BsUserController {
@Resource
private BsUserComplaintService userComplaintService;
@Resource
private PhgDataUserService phgDataUserService;
@Resource
private BsUserCardService userCardService;
@Resource
private CommonService commonService;
@Resource
private GoodsUserAddressService goodsUserAddressService;
@Resource
private GoodsSpecsService goodsSpecsService;
@Resource
private GoodsVpdService goodsVpdService;
@RequestMapping(value="/restore",method = RequestMethod.POST)
@ResponseBody

4
cweb/src/main/java/com/cweb/controller/CommonController.java
Unescape View File

@ -11,7 +11,7 @@ import com.hfkj.entity.BsOrderGoods;
import com.hfkj.entity.GoodsLogistics;
import com.hfkj.entity.GoodsUserAddress;
import com.hfkj.model.ResponseData;
import com.hfkj.qianzhu.channel.QianZhuService;
import com.hfkj.qianzhu.QianZhuService;
import com.hfkj.service.CommonService;
import com.hfkj.service.goods.BsOrderGoodsService;
import com.hfkj.service.goods.GoodsUserAddressService;
@ -24,8 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

4
cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java
Unescape View File

@ -11,13 +11,11 @@ import com.hfkj.common.utils.PageUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsProductConfig;
import com.hfkj.model.ResponseData;
import com.hfkj.model.goods.GoodsModel;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jacoco.agent.rt.internal_035b120.core.internal.flow.IFrame;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;

4
cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java
Unescape View File

@ -2,14 +2,13 @@ package com.cweb.controller.qianZhu;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hfkj.common.utils.PageUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.common.utils.StarbucksUtil;
import com.hfkj.entity.BsProductConfig;
import com.hfkj.model.ResponseData;
import com.hfkj.qianzhu.channel.StarbucksService;
import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import io.swagger.annotations.Api;
@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;

2
cweb/src/main/resources/prod/logback.xml
Unescape View File

@ -88,7 +88,7 @@
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<logger name="com.hfkj.qianzhu.channel.QianZhuService" level="INFO">
<logger name="com.hfkj.qianzhu.QianZhuService" level="INFO">
<appender-ref ref="QianZhuLog" />
</logger>
<!-- 千猪接口 -->

3
order/src/main/java/com/order/controller/business/BsOrderCinemaController.java
Unescape View File

@ -9,9 +9,8 @@ import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsOrderCinema;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.goods.BsOrderCinemaService;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;

2
order/src/main/java/com/order/controller/business/BsOrderGoodsController.java
Unescape View File

@ -156,8 +156,6 @@ public class BsOrderGoodsController {
SecUserSessionObject userModel = (SecUserSessionObject) sessionObject.getObject();
Map<String , Object> map = new HashMap<>();
if (userModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) {
map.put("merId", merId);

2
order/src/main/resources/dev/logback.xml
Unescape View File

@ -219,7 +219,7 @@
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<logger name="com.hfkj.qianzhu.channel.QianZhuService" level="INFO">
<logger name="com.hfkj.qianzhu.QianZhuService" level="INFO">
<appender-ref ref="QianZhuLog" />
</logger>
<!-- 千猪接口 -->

2
order/src/main/resources/prod/logback.xml
Unescape View File

@ -219,7 +219,7 @@
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
</appender>
<logger name="com.hfkj.qianzhu.channel.QianZhuService" level="INFO">
<logger name="com.hfkj.qianzhu.QianZhuService" level="INFO">
<appender-ref ref="QianZhuLog" />
</logger>
<!-- 千猪接口 -->

4
service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java
Unescape View File

@ -108,6 +108,10 @@ public class OrderGoodsExportModel {
@ExcelProperty("物流状态")
public String logisticsStatusDesc;
@ColumnWidth(20)
@ExcelProperty("更新时间")
public Date updateTime;
@ColumnWidth(20)
@ExcelProperty("完成时间")
public Date finishTime;

9
service/src/main/java/com/hfkj/qianzhu/channel/CinemaService.java → service/src/main/java/com/hfkj/qianzhu/CinemaService.java
Unescape View File

@ -1,19 +1,12 @@
package com.hfkj.qianzhu.channel;
package com.hfkj.qianzhu;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.entity.BsProductConfig;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
/**
* @ClassName CinemaService

2
service/src/main/java/com/hfkj/qianzhu/channel/KfcService.java → service/src/main/java/com/hfkj/qianzhu/KfcService.java
Unescape View File

@ -1,4 +1,4 @@
package com.hfkj.qianzhu.channel;
package com.hfkj.qianzhu;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.exception.ErrorCode;

2
service/src/main/java/com/hfkj/qianzhu/channel/QianZhuService.java → service/src/main/java/com/hfkj/qianzhu/QianZhuService.java
Unescape View File

@ -1,4 +1,4 @@
package com.hfkj.qianzhu.channel;
package com.hfkj.qianzhu;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;

3
service/src/main/java/com/hfkj/qianzhu/channel/StarbucksService.java → service/src/main/java/com/hfkj/qianzhu/StarbucksService.java
Unescape View File

@ -1,4 +1,4 @@
package com.hfkj.qianzhu.channel;
package com.hfkj.qianzhu;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@ -7,7 +7,6 @@ import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.CommonUtil;
import com.hfkj.common.utils.DateUtil;
import com.mysql.jdbc.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java
Unescape View File

@ -271,7 +271,6 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
@Override
public void confirmReceipt(Long orderGoodsId) {
BsOrderGoods orderGoods = queryDetail(orderGoodsId);
if (orderGoods == null ||
orderGoods.getStatus() == 1 ||
orderGoods.getStatus() == 5 ||
@ -286,6 +285,7 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
orderService.childOrderComplete(orderGoods.getChildOrderNo());
orderGoods.setStatus(OrderChildStatusEnum.status3.getCode());
orderGoods.setUpdateTime(new Date());
orderGoods.setFinishTime(new Date());
update(orderGoods);
// 删除缓存
orderService.cacheDelete(orderGoods.getOrderNo());

10
service/src/main/java/com/hfkj/service/order/OrderCreateService.java
Unescape View File

@ -7,14 +7,12 @@ import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.RandomUtils;
import com.hfkj.common.utils.RedisUtil;
import com.hfkj.common.utils.StarbucksUtil;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
import com.hfkj.model.order.OrderModel;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.channel.StarbucksService;
import com.hfkj.service.BsMerService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService;
@ -26,11 +24,7 @@ import com.hfkj.sysenum.order.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;

5
service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java
Unescape View File

@ -9,8 +9,8 @@ import com.hfkj.common.utils.DateUtil;
import com.hfkj.config.CommonSysConst;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderModel;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.channel.StarbucksService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.coupon.channel.ChongQingCNPCCouponService;
@ -19,7 +19,6 @@ import com.hfkj.service.coupon.channel.PcytCNPCCouponConfig;
import com.hfkj.service.coupon.channel.PetroConfig;
import com.hfkj.service.goods.*;
import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl;
import com.hfkj.service.goods.impl.GoodsSpecsServiceImpl;
import com.hfkj.service.hlt.HuiLianTongUnionCardService;
import com.hfkj.sysenum.GoodsVpdSourceEnum;
import com.hfkj.sysenum.order.*;

10
service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java
Unescape View File

@ -1,19 +1,12 @@
package com.hfkj.service.order;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.config.CommonSysConst;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
import com.hfkj.model.order.OrderModel;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.goods.BsOrderCinemaService;
import com.hfkj.service.goods.BsOrderStarbucksService;
import com.hfkj.service.goods.impl.BsOrderGoodsServiceImpl;
import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import com.hfkj.sysenum.order.OrderChildStatusEnum;
import org.springframework.beans.factory.annotation.Autowired;
@ -22,7 +15,6 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

4
service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java
Unescape View File

@ -4,10 +4,9 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.utils.StarbucksUtil;
import com.hfkj.dao.BsOrderChildMapper;
import com.hfkj.dao.GoodsUserAddressMapper;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
import com.hfkj.qianzhu.channel.StarbucksService;
import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.service.goods.*;
import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl;
@ -19,7 +18,6 @@ import com.hfkj.sysenum.order.OrderLogisticsStatusEnum;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

7
service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java
Unescape View File

@ -14,19 +14,14 @@ import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
import com.hfkj.model.order.OrderModel;
import com.hfkj.mqtopic.OrderTopic;
import com.hfkj.qianzhu.channel.CinemaService;
import com.hfkj.qianzhu.channel.StarbucksService;
import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.discount.CouponDiscountService;
import com.hfkj.service.discount.CouponDiscountUserRelService;
import com.hfkj.service.goods.BsOrderCinemaService;
import com.hfkj.service.goods.BsOrderGoodsService;
import com.hfkj.service.goods.BsOrderStarbucksService;
import com.hfkj.service.order.*;
import com.hfkj.service.user.UserIntegralService;
import com.hfkj.service.user.impl.PhgDataUserServiceImpl;
import com.hfkj.sysenum.UserIntegralRecordOpUserTypeEnum;
import com.hfkj.sysenum.UserIntegralRecordSourceTypeEnum;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;

Write Preview
Loading…
Cancel
Save