Quellcode durchsuchen

Merge tag 'refs/tags/jenkins-back-end-1068' into release

develop
release_toaliyun_real
Stormeye Wu vor 7 Jahren
Ursprung
Commit
9d0656ac0a
16 geänderte Dateien mit 97 neuen und 13 gelöschten Zeilen
  1. +22
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java
  2. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java
  3. +0
    -4
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  5. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  6. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  7. +3
    -0
      mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java
  8. +1
    -0
      mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java
  9. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java
  10. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java
  11. +10
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  12. +13
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  13. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  14. +7
    -0
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml
  15. +3
    -0
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
  16. +1
    -1
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 22
- 2
mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java Datei anzeigen

@@ -7,9 +7,9 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.domain.vo.MallUserInfoVo;
import com.iformall.enums.EnumMallUserStatus;
import com.iformall.enums.EnumMsgModel;
import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.mq.MqBaseProducer;
import com.iformall.service.*;
import com.iformall.shiro.UserSession;
import com.iformall.shiro.UseriFormallToken;
@@ -66,6 +66,26 @@ public class HomeController extends BaseController {
@Autowired
private WxMsgValidationcodeService wxMsgValidationcodeService;

@Autowired
private MqBaseProducer mqBaseProducer;

// @ApiOperation("发送邮件")
// @GetMapping("test")
// public ResultData test() throws Exception {
// String msg = "<!DOCTYPE html><html><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width,initial-scale=1.0\"><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><meta name=\"viewport\" content=\"initial-scale=1.0, user-scalable=no\" /><meta name=\"renderer\" content=\"webkit\"><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><title>富茂审批邮件</title><title></title><script> document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + 'px';</script></head>\n" +
// "<body><div id=\"box\"><header style=\"height:140px;width:100%;display:flex;background:rgba(31,47,62,1);border-radius:15px 15px 0px 0px;\"><img style=\"height:auto;width:292px;display:flex;align-self: center;justify-content: center;margin-left: 40px;\" src=\"https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/changrong-logo.png\"/>\n" +
// "</header><content><div style=\"font-size:26px;font-family:MicrosoftYaHei-Bold;font-weight:bold;color:rgba(85,85,85,1);line-height: 32px;margin-top: 56px;margin-left: 55px;\">审批通过通知</div><div style=\"font-size:18px;font-family:MicrosoftYaHei;font-weight:400;color:rgba(85,85,85,1);margin-left: 55px;margin-top: 36px;\">编号<span>123231232323</span>的合同已经审批通过,请登录,<a href=\"http://mall.youlane.cn\">长融后台</a>跟进后续工作</div></content></div></body></html>";
// MailMsg mailMsg = new MailMsg();
// mailMsg.setHtml(true);
// mailMsg.setFrom("luozukai1988@126.com");
// mailMsg.setTo(new String[]{"luozukai@iformall.com"});
// mailMsg.setSubject("富茂测试邮件");
// mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode());
// mailMsg.setMsg(msg);
// mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());
// return new ResultData();
// }

@GetMapping("/captcha.jpg")
public void captcha(HttpServletResponse response)throws ServletException, IOException {
logger.debug("[" + getIpAddr() + "] HomeController::captcha");


+ 5
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java Datei anzeigen

@@ -2,8 +2,10 @@ package com.iformall.controller;

import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.MailMsg;
import com.iformall.domain.po.WxCoupon;
import com.iformall.enums.*;
import com.iformall.mq.MqBaseProducer;
import com.iformall.service.WxCouponService;
import com.iformall.utils.DateUtils;
import io.swagger.annotations.Api;
@@ -14,7 +16,10 @@ import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.web.bind.annotation.*;

import javax.mail.internet.MimeMessage;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -27,7 +32,6 @@ public class WxCouponController extends BaseController {
@Autowired
private WxCouponService wxCouponService;


@ApiOperation("分页列表接口")
@GetMapping("listCoupon")
@ApiImplicitParams({


+ 0
- 4
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java Datei anzeigen

@@ -12,7 +12,6 @@ import com.iformall.domain.po.WxPayOrder;
import com.iformall.enums.EnumPayStatus;
import com.iformall.enums.EnumPayWay;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxCouponService;
import com.iformall.service.WxOrderService;
import com.iformall.service.WxPayOrderService;
import com.iformall.utils.IPUtil;
@@ -44,9 +43,6 @@ public class WxPayOrderController extends BaseController {
@Autowired
private WxOrderService wxOrderService;

@Autowired
private WxCouponService wxCouponService;

@ApiOperation(value = "发起微信小程序支付订单", notes = "{\"orderId\":\"string\"}")
@RequestMapping(value = "/create", method = RequestMethod.POST)
public ResultData _create(@RequestBody Map<String, String> paramMap, HttpServletRequest request) throws Exception {


+ 1
- 1
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Datei anzeigen

@@ -374,7 +374,7 @@ public enum ErrorCode{
* 拼团
*/
ORDER_GROUP_COOPERATING_FAILD(28001, "参团失败"),
ORDER_GROUP_COOPERATING_FINISHED(28002, "拼团人数已满"),
;

private int code;


+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Datei anzeigen

@@ -19,6 +19,9 @@ public class WxCoupon implements Serializable {

@Transient
protected List<Long> ids;

@Transient
protected List<Long> notinTypes;
@Transient
protected String sortColumns;

@@ -662,4 +665,12 @@ public class WxCoupon implements Serializable {
public void setXtime(String xtime) {
this.xtime = xtime;
}

public List<Long> getNotinTypes() {
return notinTypes;
}

public void setNotinTypes(List<Long> notinTypes) {
this.notinTypes = notinTypes;
}
}

+ 12
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java Datei anzeigen

@@ -117,6 +117,18 @@ public class WxCouponOrderBVo extends WxCouponOrder{
@Transient
private Date endDate;

@Transient
private Long couponId;

@Override
public Long getCouponId() {
return couponId;
}

@Override
public void setCouponId(Long couponId) {
this.couponId = couponId;
}

public Date getStartDate() {
return startDate;


+ 3
- 0
mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java Datei anzeigen

@@ -14,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;

import java.util.UUID;

/**
* @Auther: Stormeye
* @Date: 2019-01-31
@@ -34,6 +36,7 @@ public class RabbitMqMessageProducer implements MqBaseProducer {
@Override
public void sendMessage(BaseMsg data, String topic, String tags, String keys) {
try {
data.setUuid(UUID.randomUUID().toString());
wxMsgRecordService.save(data);

rabbitTemplate.convertAndSend(topic, JsonUtil.obj2Json(data));


+ 1
- 0
mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java Datei anzeigen

@@ -59,6 +59,7 @@ public class RocketMqMessageProducer implements MqBaseProducer {
@Override
public void sendMessage(BaseMsg data, String topic, String tags, String keys) {
try {
data.setUuid(UUID.randomUUID().toString());
wxMsgRecordService.save(data);

byte[] messageBody = JsonUtil.obj2Json(data).getBytes(RemotingHelper.DEFAULT_CHARSET);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java Datei anzeigen

@@ -35,7 +35,7 @@ public class SendEmailServiceImpl implements MsgSendService {
public void send(BaseMsg baseMsg) throws Exception{
MailMsg mailMsg = (MailMsg)baseMsg;

if(mailMsg.isHtml()){
if(mailMsg.isHtml()){ //html邮件
MimeMessage message = sender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(message, true);
helper.setFrom(from);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java Datei anzeigen

@@ -29,7 +29,7 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService {
}

msgRecord.setMsgType(data.getMsgType());
msgRecord.setUuid(UUID.randomUUID().toString());
msgRecord.setUuid(data.getUuid());
msgRecord.setMsgJson(JsonUtil.obj2Json(data));
msgRecord.setId(idWorker.nextId());
wxMsgRecordMapper.save(msgRecord);


+ 10
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Datei anzeigen

@@ -99,6 +99,9 @@ public class WxOrderServiceImpl implements WxOrderService {
@Autowired
WxOrderPressMapper wxOrderPressMapper;

@Autowired
WxOrderGroupMapper wxOrderGroupMapper;

@Override
public PageInfo<WxOrder> listAsPage(WxOrder record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record));
@@ -354,7 +357,13 @@ public class WxOrderServiceImpl implements WxOrderService {
logger.error("商户不存在, couponId: " + couponIdStr);
throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND);
}

if (!orderGroupId.equals(0L)) {
WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(orderGroupId);
if (group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) {
logger.error("下订单拼团人数已满>>>" + orderGroupId);
throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED);
}
}
// 减库存操作
stockReduce(user, coupon, couponIdStr);



+ 13
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Datei anzeigen

@@ -121,6 +121,19 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
logger.error("pay order, order not allow, repaymentReq: " + record.toString() + ", payWay: " + payWay.toString());
throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND);
}
if (!order.getOrderGroupId().equals(0L) &&
order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) {
logger.error("支付时拼团已满>>" + order.getOrderGroupId());
throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED);
}

WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(order.getProductId());
if (wxCoupon.getType().equals(EnumCouponType.COUPON_GROUP.getCode()) &&
wxCoupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode())) {
logger.error("券已经下架了>>>" + order.getProductId());
throw new MallinkException(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF);
}

if(order.getPressEndDate() == null) {
// 非砍价券
if (order.getOrderStatus() == EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()) {


+ 6
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Datei anzeigen

@@ -313,7 +313,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
logger.info("id:{},启动审批流成功 ,是否补录:{}",record.getId().toString(),record.getMerchantId() != null);
}


// 保存调整金额(预账单调整)
if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){
for (WxBillRent wxBillRent:record.getPreviewBillRentList()) {
wxBillRentMapper.update(wxBillRent);
}
}
WxRentContract wxRentContract = (WxRentContract)resultData.data;
wxRentContract.setPreviewBillRentList(resultList);
return new ResultData(wxRentContract);


+ 7
- 0
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Datei anzeigen

@@ -183,6 +183,13 @@
#{idItem}
</foreach>
</if>
<if test=" null != notinTypes ">
and type not in
<foreach collection="notinTypes" index="index" item="typeItem" open="(" separator="," close=")">
#{typeItem}
</foreach>
</if>

<if test=" null != sortColumns">order by ${sortColumns}</if>
</sql>



+ 3
- 0
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Datei anzeigen

@@ -358,6 +358,9 @@
<if test=" null != id ">
and co.id = #{id}
</if>
<if test=" null != couponId ">
and c.id = #{couponId}
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>


+ 1
- 1
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Datei anzeigen

@@ -233,7 +233,7 @@
from wx_coupon c,wx_order o
left join wx_coupon_order co on co.order_id = o.id
left join wx_coupon_action_log cal on cal.coupon_order_id = co.id
where o.product_id = c.id
where o.product_id = c.id and c.type!=9
<if test="cUserId != null">
and o.c_user_id = #{cUserId}
</if>


Laden…
Abbrechen
Speichern