Merge branch 'dev_yy' into 2.0-dev

* dev_yy: (25 commits)
  提交代理商
  1
  1
  提交实物
  提交代码
  提交代码
  提交代码
  提交抽奖代码
  1
  提交代码
  提交代码
  提交代码
  提交代码
  提交代码
  提交
  1
  1
  修改首页没有积分专区
  提交代码
  修改小程序注册用券
  ...

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
#	hai-service/src/main/java/com/hai/common/utils/DateUtil.java
#	hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
#	hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
#	hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
#	hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
#	hai-service/src/main/java/com/hai/entity/HighChildOrder.java
#	hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
#	hai-service/src/main/java/com/hai/entity/HighOrder.java
#	hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
#	hai-service/src/main/java/com/hai/service/HighUserService.java
#	hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
#	hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
#	hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
#	hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
dev-discount
袁野 2 years ago
parent a9bcd6800f
commit ef68627087
  1. 10
      hai-cweb/src/main/java/com/cweb/controller/BsMsgController.java
  2. 11
      hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java
  3. 2
      hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
  4. 3
      hai-order/src/main/java/com/web/controller/OrderController.java
  5. 14
      hai-service/src/main/java/com/hai/config/QianZhuConfig.java
  6. 4
      hai-service/src/main/java/com/hai/dao/BsMsgUserMapperExt.java
  7. 4
      hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java
  8. 17
      hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
  9. 25
      hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java
  10. 16
      hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
  11. 2
      hai-service/src/main/java/com/hai/service/BsMsgService.java
  12. 7
      hai-service/src/main/java/com/hai/service/impl/BsConfigServiceImpl.java
  13. 6
      hai-service/src/main/java/com/hai/service/impl/BsMsgServiceImpl.java

@ -47,9 +47,7 @@ public class BsMsgController {
@ApiOperation(value = "查询站内信列表")
public ResponseData getMsgByList(
@RequestParam(value = "type", required = false) Integer type,
@RequestParam(value = "companyId", required = true) String companyId,
@RequestParam(name = "pageNum", required = true) Integer pageNum,
@RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request
@RequestParam(value = "companyId", required = true) String companyId , HttpServletRequest request
) {
try {
@ -59,11 +57,9 @@ public class BsMsgController {
// 查询个人信息
Map<String, Object> mapUser = new HashMap<>();
mapUser.put("companyId" , companyId);
mapUser.put("msgType" , 1);
mapUser.put("type" , type);
mapUser.put("userId" , userInfoModel.getHighUser().getId());
mapUser.put("num" , 1000);
List<BsMsg> listUser = bsMsgService.queryMsgByList(mapUser);
// 查询全局信息
@ -71,7 +67,6 @@ public class BsMsgController {
map.put("companyId" , companyId);
map.put("type" , type);
map.put("msgType" , 2);
map.put("num" , 1000);
List<BsMsg> list = bsMsgService.queryMsgByList(map);
list.addAll(listUser);
@ -79,8 +74,7 @@ public class BsMsgController {
list = list.stream().sorted(Comparator.comparing(BsMsg::getCreateTime).reversed())
.collect(Collectors.toList());
PageHelper.startPage(pageNum,pageSize);
return ResponseMsgUtil.success(new PageInfo<>(list));
return ResponseMsgUtil.success(list);
} catch (Exception e) {
log.error("BsMsgController --> getMsgByList() error!", e);

@ -114,7 +114,8 @@ public class CmsContentController {
object.put("jumpType" , cmsContent.get(0).getJumpType());
object.put("jumpUrl" , cmsContent.get(0).getJumpUrl());
}
List<BsMsg> list = new ArrayList<>();
List<BsMsg> list;
List<BsMsg> listUser = new ArrayList<>();
if (sessionObject != null) {
Map<String, Object> mapUser = new HashMap<>();
@ -122,19 +123,17 @@ public class CmsContentController {
mapUser.put("companyId" , companyId);
mapUser.put("msgType" , 1);
mapUser.put("userId" , userInfoModel.getHighUser().getId());
mapUser.put("num" , 6);
list = bsMsgService.queryMsgByList(mapUser);
listUser = bsMsgService.queryMsgByList(mapUser);
}
Map<String, Object> map = new HashMap<>();
if (list.size() == 0) {
map.put("companyId" , companyId);
map.put("msgType" , 2);
map.put("num" , 6);
list = bsMsgService.queryMsgByList(map);
}
list.addAll(listUser);
list = list.stream().sorted(Comparator.comparing(BsMsg::getCreateTime).reversed())
.collect(Collectors.toList());

File diff suppressed because one or more lines are too long

@ -58,6 +58,7 @@ public class OrderController {
@ApiOperation(value = "创建订单")
public ResponseData create(@RequestBody CreateOrderModel body) {
try {
System.out.println("=================" + JSONObject.toJSONString(body));
// 用户信息
HighUserModel userModel = userCenter.getSessionModel(HighUserModel.class);
if (userModel == null) {
@ -196,7 +197,7 @@ public class OrderController {
@RequestMapping(value = "/orderCheck", method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "根据订单id查看订单")
@ApiOperation(value = "根据订单查看订单")
public ResponseData orderCheck(@RequestParam(name = "orderNo", required = true) String orderNo) {
try {

@ -68,24 +68,24 @@ public class QianZhuConfig {
/**
* KFC
* 支付订单
* @param orderNo
* @param channelOrderNo 渠道订单号
* @return
* @throws Exception
*/
public static JSONObject payKfcOrder(String orderNo) throws Exception {
public static JSONObject payKfcOrder(String channelOrderNo) throws Exception {
Map<String,Object> map = new HashMap<>();
map.put("platformId", CommonSysConst.getSysConfig().getQinzhuPlatformId());
map.put("timestamp", new Date().getTime());
map.put("notifyUrl", CommonSysConst.getSysConfig().getQianzhuOrderNotify());
map.put("orderNo", orderNo);
map.put("orderNo", channelOrderNo);
map.put("sign", MD5Util.encode(generateSignature(map,CommonSysConst.getSysConfig().getQinzhuSecret()).getBytes()).toLowerCase());
log.info("============请求任务Start=============");
log.info("肯德基-请求参数: " + JSON.toJSONString(map));
log.info("肯德基支付-请求参数: " + JSON.toJSONString(map));
JSONObject object = HttpsUtils.doPost(CommonSysConst.getSysConfig().getQinzhuUrl()+"/openApi/v1/orders/payKfcOrder", JSONObject.toJSONString(map));
log.info("肯德基-响应参数: " + object.toJSONString());
log.info("肯德基支付-响应参数: " + object.toJSONString());
log.info("============请求任务End==============");
return object;
}
@ -357,9 +357,9 @@ public class QianZhuConfig {
* @Param [java.lang.String]
* @return com.alibaba.fastjson.JSONObject
*/
public static JSONObject starbucksOrdersPay(String orderNo) throws Exception {
public static JSONObject starbucksOrdersPay(String channelOrderNo) throws Exception {
Map<String,Object> contentMap = new LinkedHashMap<>();
contentMap.put("orderNo", orderNo);
contentMap.put("orderNo", channelOrderNo);
Map<String,Object> map = new HashMap<>();
map.put("platformId", CommonSysConst.getSysConfig().getQinzhuPlatformId());
map.put("action", "starbucksOrders.pay");

@ -19,13 +19,13 @@ public interface BsMsgUserMapperExt {
@Select({"<script>" +
"select bs.* from bs_msg bs left join bs_msg_user bmu on bs.id = bmu.msg_id " +
"where status = 2 " +
"and company_id = #{param.companyId} " +
"<if test='param.companyId != null'> and company_id = #{param.companyId} </if>",
"<if test='param.userId != null'> and user_id = #{param.userId} </if>",
"<if test='param.userId == null'> and user_id is null </if>",
"<if test='param.type != null'> and type = #{param.type} </if>",
"<if test='param.msgType != null'> and msg_type = #{param.msgType} </if>",
"<if test='param.whereCheck != null'> and where_check = #{param.whereCheck} </if>",
"order by create_time desc limit #{param.num}; " +
"order by create_time desc " +
" </script>"})
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),

@ -32,7 +32,7 @@ public interface OrderCreateHandleService {
* @param createOrderChild
* @return
*/
HighChildOrder integralRecharge(CreateOrderChildModel createOrderChild);
HighChildOrder integralRecharge(HighOrder order , CreateOrderChildModel createOrderChild);
/**
* 加油校验
@ -64,7 +64,7 @@ public interface OrderCreateHandleService {
* @Param [object]
* @Return java.util.List<com.hai.entity.HighChildOrder>
*/
List<HighChildOrder> thirdPartyOrder(JSONObject object) throws Exception;
List<HighChildOrder> thirdPartyOrder(HighOrder order, JSONObject object) throws Exception;
/**
* @Author Sum1Dream

@ -265,13 +265,17 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
}
@Override
public HighChildOrder integralRecharge(CreateOrderChildModel createOrderChild) {
public HighChildOrder integralRecharge(HighOrder order , CreateOrderChildModel createOrderChild) {
// 查询用户信息
HighUser user = userService.getDetailDataByUser(createOrderChild.getGoodsId());
if (user == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到用户信息");
}
HighChildOrder childOrder = new HighChildOrder();
childOrder.setOrderNo(order.getOrderNo());
childOrder.setMemId(createOrderChild.getMemId());
childOrder.setMemName(createOrderChild.getMemName());
childOrder.setMemPhone(createOrderChild.getMemPhone());
childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo());
childOrder.setGoodsType(OrderChildGoodsType.TYPE2.getNumber());
childOrder.setGoodsId(user.getId());
@ -597,7 +601,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
}
@Override
public List<HighChildOrder> thirdPartyOrder(JSONObject object) throws Exception {
public List<HighChildOrder> thirdPartyOrder(HighOrder order , JSONObject object) throws Exception {
JSONObject jsonObject;
@ -689,10 +693,10 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
childOrder.setGoodsType(9);
childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo());
childOrder.setStoreId(object.getLong("storeCode"));
childOrder.setChannelOrderNo(jsonObject.getJSONObject("data").getString("orderNo"));
childOrder.setChannelOrderNo(orderNo);
childOrder.setGoodsId(object.getLong("productId"));
childOrder.setMemId(user.getId());
childOrder.setOrderNo(orderNo);
childOrder.setOrderNo(order.getOrderNo());
childOrder.setMemName(user.getName());
childOrder.setMemPhone(user.getPhone());
childOrder.setStoreAddress(orderObject.getJSONObject("data").getString("storeAddress"));
@ -755,9 +759,9 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
childOrder.setMemName(user.getName());
childOrder.setMemPhone(user.getPhone());
childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo());
childOrder.setOrderNo(orderNo);
childOrder.setOrderNo(order.getOrderNo());
childOrder.setGoodsId(object.getLong("productId"));
childOrder.setChannelOrderNo(jsonObject.getJSONObject("data").getString("orderNo"));
childOrder.setChannelOrderNo(orderNo);
childOrder.setStoreAddress(orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getString("storeAddress"));
childOrder.setStoreName(orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getString("storeName"));
childOrder.setGoodsName(childObject.getString("productName"));
@ -802,6 +806,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
childOrder.setChildOrderStatus(1);
childOrder.setGoodsType(10);
childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo());
childOrder.setOrderNo(order.getOrderNo());
childOrder.setStoreId(object.getLong("storeCode"));
childOrder.setGoodsId(memberProduct.getId());
childOrder.setGoodsName(memberProduct.getName());

@ -140,7 +140,7 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
orderBusHandle(order);
// 推送消息
pushUserMsg(order.getId() , "支付成功");
pushUserMsg(order.getId() , OrderProductType.getDataByType(order.getProductType()).getName() +"下单支付成功");
}
return order;
@ -157,7 +157,7 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
@Async
public void pushUserMsg(Long order, String title) throws Exception {
bsMsgService.pushUserMsg(order , title);
bsMsgService.pushUserMsg(order , title , 2);
}
/**
@ -172,6 +172,15 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
rollbackFor = Exception.class)
public void orderBusHandle(HighOrder order) throws Exception {
// 子订单存在多个情况下订单处理
if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE1.getNumber()) || order.getProductType().equals(OrderProductType.PRODUCT_TYPE2.getNumber())) {
if (order.getHighChildOrderList().get(0).getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber())) {
kfcHandle(order.getHighChildOrderList().get(0).getChannelOrderNo());
} else if (order.getHighChildOrderList().get(0).getGoodsType().equals(OrderChildGoodsType.TYPE9.getNumber())) {
starbucksOrderHandle(order.getHighChildOrderList().get(0).getChannelOrderNo());
}
}
for (HighChildOrder childOrder : order.getHighChildOrderList()) {
if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE1.getNumber())) {
couponHandle(order, childOrder);
@ -186,7 +195,7 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
orderService.updateOrderData(order);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber())) {
kfcHandle(order);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE5.getNumber())) {
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE6.getNumber())) {
@ -196,7 +205,7 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE8.getNumber())) {
hltUnionCardRechargeHandle(order);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE9.getNumber())) {
starbucksOrderHandle(order);
} else if (childOrder.getGoodsType().equals(OrderChildGoodsType.TYPE10.getNumber())) {
thirdOrderHandle(order);
}
@ -348,10 +357,10 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
* @Param [order]
* @Return void
*/
private void kfcHandle(HighOrder order) throws Exception {
private void kfcHandle(String channelOrderNo) throws Exception {
// 支付给千猪
QianZhuConfig.payKfcOrder(order.getOrderNo());
QianZhuConfig.payKfcOrder(channelOrderNo);
// 推送订单记录
// HighGasOrderPush highGasOrderPush = new HighGasOrderPush();
// highGasOrderPush.setType(OrderPushType.type3.getType());
@ -452,9 +461,9 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService {
* @Param [order]
* @Return void
*/
private void starbucksOrderHandle(HighOrder order) throws Exception {
private void starbucksOrderHandle(String channelOrderNo) throws Exception {
// 订单支付
JSONObject requestContent = QianZhuConfig.starbucksOrdersPay(order.getOrderNo());
QianZhuConfig.starbucksOrdersPay(channelOrderNo);
// 推送订单记录
// HighGasOrderPush highGasOrderPush = new HighGasOrderPush();

@ -168,14 +168,14 @@ public class OrderServiceImpl implements OrderService {
if (StringUtils.isBlank(order.getSearchTitle())) {
order.setTitle(childOrder.getGoodsName());
} else {
order.setTitle("+"+childOrder.getGoodsName());
order.setTitle(order.getTitle() + "+" + childOrder.getGoodsName());
}
}
// 积分充值
} else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE2.getNumber())) {
order.setProductType(OrderProductType.PRODUCT_TYPE4.getNumber());
// 创建积分充值订单业务
HighChildOrder oilOrder = orderCreateHandleService.integralRecharge(child);
HighChildOrder oilOrder = orderCreateHandleService.integralRecharge(order , child);
childOrderList.add(oilOrder);
order.setTitle("积分充值");
@ -191,13 +191,13 @@ public class OrderServiceImpl implements OrderService {
} else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber())) {
order.setProductType(OrderProductType.PRODUCT_TYPE2.getNumber());
// 创建肯德基订单业务
List<HighChildOrder> couponOrderList = orderCreateHandleService.thirdPartyOrder(object);
List<HighChildOrder> couponOrderList = orderCreateHandleService.thirdPartyOrder(order , object);
childOrderList = couponOrderList;
for (HighChildOrder childOrder : couponOrderList) {
if (StringUtils.isBlank(order.getTitle())) {
if (order.getTitle() == null) {
order.setTitle(childOrder.getGoodsName());
} else {
order.setTitle("+"+childOrder.getGoodsName());
order.setTitle(order.getTitle() + "+" + childOrder.getGoodsName());
}
}
@ -229,20 +229,20 @@ public class OrderServiceImpl implements OrderService {
} else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE9.getNumber())) {
order.setProductType(OrderProductType.PRODUCT_TYPE1.getNumber());
// 创建星巴克订单业务
List<HighChildOrder> couponOrderList = orderCreateHandleService.thirdPartyOrder(object);
List<HighChildOrder> couponOrderList = orderCreateHandleService.thirdPartyOrder(order, object);
childOrderList = couponOrderList;
for (HighChildOrder childOrder : couponOrderList) {
if (StringUtils.isBlank(order.getTitle())) {
order.setTitle(childOrder.getGoodsName());
} else {
order.setTitle("+"+childOrder.getGoodsName());
order.setTitle(order.getTitle() + "+"+childOrder.getGoodsName());
}
}
// 第三方充值
} else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE10.getNumber())) {
order.setProductType(OrderProductType.PRODUCT_TYPE3.getNumber());
// 创建第三方充值订单业务
List<HighChildOrder> couponOrderList = orderCreateHandleService.thirdPartyOrder(object);
List<HighChildOrder> couponOrderList = orderCreateHandleService.thirdPartyOrder(order , object);
childOrderList = couponOrderList;
for (HighChildOrder childOrder : couponOrderList) {
if (StringUtils.isBlank(order.getTitle())) {

@ -95,7 +95,7 @@ public interface BsMsgService {
* @Param [orderId, userId]
* @Return void
*/
void pushUserMsg(Long orderId , String title) throws Exception;
void pushUserMsg(Long orderId , String title , Integer type) throws Exception;
}

@ -92,16 +92,17 @@ public class BsConfigServiceImpl implements BsConfigService {
StringBuilder stringName = new StringBuilder();
StringBuilder string = new StringBuilder();
// 1:支付宝 2:微信 3:汇联通工会卡 4:银联 5:银联分期
// 1:支付宝 2:微信 3:汇联通工会卡 4:银联 5:银联分期 6 嗨森逛油卡
for (BsProductPayType productPayType : list) {
// platformId 1:小程序 2:h5 3:银联
if (platformId != null) {
if (platformId == 1 || platformId == 2) {
if (productPayType.getPayTypeId() == 2 || productPayType.getPayTypeId() == 3) {
if (productPayType.getPayTypeId() == 2 || productPayType.getPayTypeId() == 3 || productPayType.getPayTypeId() == 6 || productPayType.getPayTypeId() == 7) {
stringName.append(productPayType.getPayTypeName()).append(",");
string.append(productPayType.getPayTypeId()).append(",");
}
} else if (platformId == 3) {
if (productPayType.getPayTypeId() == 4 || productPayType.getPayTypeId() == 5) {
if (productPayType.getPayTypeId() == 4 || productPayType.getPayTypeId() == 5 || productPayType.getPayTypeId() == 3 || productPayType.getPayTypeId() == 6 || productPayType.getPayTypeId() == 7) {
stringName.append(productPayType.getPayTypeName()).append(",");
string.append(productPayType.getPayTypeId()).append(",");
}

@ -144,7 +144,7 @@ public class BsMsgServiceImpl implements BsMsgService {
}
@Override
public void pushUserMsg(Long orderId,String title) throws Exception {
public void pushUserMsg(Long orderId,String title , Integer type) throws Exception {
// 查询订单
HighOrder highOrder = highOrderService.getOrderById(orderId);
// 查询用户信息
@ -152,7 +152,9 @@ public class BsMsgServiceImpl implements BsMsgService {
JSONObject object = new JSONObject();
object.put("price" , highOrder.getPayRealPrice());
object.put("productType" , highOrder.getProductType());
object.put("objectName" , highOrder.getTitle());
object.put("orderNo" , highOrder.getOrderNo());
object.put("time" , DateUtil.date2String(highOrder.getCreateTime() , DateUtil.Y_M_D_HMS_C));
BsMsg bsMsg = new BsMsg();
@ -160,7 +162,7 @@ public class BsMsgServiceImpl implements BsMsgService {
bsMsg.setCompanyId(highOrder.getCompanyId());
bsMsg.setOpName("系统生成");
bsMsg.setMsgType(1);
bsMsg.setType(1);
bsMsg.setType(type);
bsMsg.setObjectId(orderId);
bsMsg.setObjectType(highOrder.getPayType());
bsMsg.setJumpType(1);

Loading…
Cancel
Save