'1'

zzjs-admin/src/main/java/com/miaxis/app/controller/wx/WxController.java

@@ -108,7 +108,6 @@ public class WxController extends BaseController {
         order.setOpenid(student.getOpenid());
         order.setGoodsType("3");
         order.setGoodsPictureUrl(wxOrderCreatePhoneBillDTO.getGoodsPictureUrl());
-        //保存电影下单数据
         wxOrderService.createPhoneBillOrder(order,wxOrderCreatePhoneBillDTO);
         wxOrderService.save(order);
         return Response.success(placeWxOrder(order, "活动-话费充值"));

zzjs-admin/src/main/java/com/miaxis/pc/controller/wx/PcWxController.java

@@ -61,7 +61,7 @@ class PcWxController extends BaseController {
     @PutMapping
     @ApiOperation("完成订单")
     public Response edit(String outTradeNo){
-        if (!StringUtils.isEmpty(outTradeNo)){
+        if (StringUtils.isEmpty(outTradeNo)){
             throw new CustomException("订单号必传");
         }
         WxOrder wxOrder = wxOrderService.getByOutTradeNo(outTradeNo);

zzjs-service/src/main/java/com/miaxis/activities/domain/ActivitiesTmall.java

@@ -0,0 +1,107 @@
+package com.miaxis.activities.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 活动-天猫订单对象 activities_tmall
+ *
+ * @author miaxis
+ * @date 2021-06-29
+ */
+@Data
+@TableName("activities_tmall")
+@ApiModel(value = "ActivitiesTmall", description = "活动-天猫订单对象 activities_tmall")
+public class ActivitiesTmall extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 天猫订单号 */
+    @Excel(name = "天猫订单号")
+    @TableField("tmall_no")
+    @ApiModelProperty(value = "天猫订单号")
+    private String tmallNo;
+
+    /** 是否被兑换过  0-未兑换 1-已兑换 */
+    @Excel(name = "是否被兑换过  0-未兑换 1-已兑换")
+    @TableField("is_exchange")
+    @ApiModelProperty(value = "是否被兑换过  0-未兑换 1-已兑换")
+    private Integer isExchange;
+
+    /** 兑换时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "兑换时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("exchange_time")
+    @ApiModelProperty(value = "兑换时间")
+    private Date exchangeTime;
+
+    /** 活动类型 1-话费充值 */
+    @Excel(name = "活动类型 1-话费充值")
+    @TableField("activities_type")
+    @ApiModelProperty(value = "活动类型 1-话费充值")
+    private Integer activitiesType;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setTmallNo(String tmallNo){
+        this.tmallNo = tmallNo;
+    }
+
+    public String getTmallNo(){
+        return tmallNo;
+    }
+    public void setIsExchange(Integer isExchange){
+        this.isExchange = isExchange;
+    }
+
+    public Integer getIsExchange(){
+        return isExchange;
+    }
+    public void setExchangeTime(Date exchangeTime){
+        this.exchangeTime = exchangeTime;
+    }
+
+    public Date getExchangeTime(){
+        return exchangeTime;
+    }
+    public void setActivitiesType(Integer activitiesType){
+        this.activitiesType = activitiesType;
+    }
+
+    public Integer getActivitiesType(){
+        return activitiesType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("tmallNo", getTmallNo())
+            .append("isExchange", getIsExchange())
+            .append("exchangeTime", getExchangeTime())
+            .append("activitiesType", getActivitiesType())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

zzjs-service/src/main/java/com/miaxis/activities/mapper/ActivitiesTmallMapper.java

@@ -0,0 +1,23 @@
+package com.miaxis.activities.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.activities.domain.ActivitiesTmall;
+
+/**
+ * 活动-天猫订单Mapper接口
+ *
+ * @author miaxis
+ * @date 2021-06-29
+ */
+public interface ActivitiesTmallMapper extends BaseMapper<ActivitiesTmall> {
+    /**
+     * 查询活动-天猫订单列表
+     *
+     * @param activitiesTmall 活动-天猫订单
+     * @return 活动-天猫订单集合
+     */
+    public List<ActivitiesTmall> selectActivitiesTmallList(ActivitiesTmall activitiesTmall);
+
+    ActivitiesTmall getByTmallNoWithPhoneBill(String tmallNo);
+}

zzjs-service/src/main/java/com/miaxis/activities/service/IActivitiesTmallService.java

@@ -0,0 +1,23 @@
+package com.miaxis.activities.service;
+
+import java.util.List;
+import com.miaxis.activities.domain.ActivitiesTmall;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 活动-天猫订单Service接口
+ *
+ * @author miaxis
+ * @date 2021-06-29
+ */
+public interface IActivitiesTmallService extends IService<ActivitiesTmall>{
+    /**
+     * 查询活动-天猫订单列表
+     *
+     * @param activitiesTmall 活动-天猫订单
+     * @return 活动-天猫订单集合
+     */
+    public List<ActivitiesTmall> selectActivitiesTmallList(ActivitiesTmall activitiesTmall);
+
+    ActivitiesTmall getByTmallNoWithPhoneBill(String tmallNo);
+}

zzjs-service/src/main/java/com/miaxis/activities/service/impl/ActivitiesTmallServiceImpl.java

@@ -0,0 +1,41 @@
+package com.miaxis.activities.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.activities.mapper.ActivitiesTmallMapper;
+import com.miaxis.activities.domain.ActivitiesTmall;
+import com.miaxis.activities.service.IActivitiesTmallService;
+
+/**
+ * 活动-天猫订单Service业务层处理
+ *
+ * @author miaxis
+ * @date 2021-06-29
+ */
+@Service
+public class ActivitiesTmallServiceImpl extends ServiceImpl<ActivitiesTmallMapper, ActivitiesTmall> implements IActivitiesTmallService {
+    @Autowired
+    private ActivitiesTmallMapper activitiesTmallMapper;
+
+    /**
+     * 查询活动-天猫订单列表
+     *
+     * @param activitiesTmall 活动-天猫订单
+     * @return 活动-天猫订单
+     */
+    @Override
+    public List<ActivitiesTmall> selectActivitiesTmallList(ActivitiesTmall activitiesTmall){
+        return activitiesTmallMapper.selectActivitiesTmallList(activitiesTmall);
+    }
+
+    @Override
+    public ActivitiesTmall getByTmallNoWithPhoneBill(String tmallNo) {
+        return activitiesTmallMapper.getByTmallNoWithPhoneBill(tmallNo);
+    }
+}

zzjs-service/src/main/java/com/miaxis/wx/dto/WxOrderCreatePhoneBillDTO.java

@@ -8,10 +8,10 @@ public class WxOrderCreatePhoneBillDTO {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "天猫订单号")
-    private String tmall_no;
+    private String tmallNo;
 
     @ApiModelProperty(value = "充值号码")
-    private Integer recharge_phone_no;
+    private Integer rechargePhoneNo;
 
     @ApiModelProperty(value = "运营商：1-移动 2-联通 3-电信")
     private Integer operators;

zzjs-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -8,6 +8,8 @@ import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.activities.domain.ActivitiesTmall;
+import com.miaxis.activities.service.IActivitiesTmallService;
 import com.miaxis.common.enums.OrderStatusEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.sms.MD5Utils;
@@ -63,7 +65,9 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
     private IRefundRecordService refundRecordService;
     @Autowired
     private IFuluService fuluService;
-       @Autowired
+    @Autowired
+    private IActivitiesTmallService activitiesTmallService;
+    @Autowired
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     @Value("${film.notifyUrl}")
@@ -388,6 +392,13 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
 
     @Override
     public void createPhoneBillOrder(WxOrder wxOrder, WxOrderCreatePhoneBillDTO wxOrderCreatePhoneBillDTO) {
+        ActivitiesTmall activitiesTmall= activitiesTmallService.getByTmallNoWithPhoneBill(wxOrderCreatePhoneBillDTO.getTmallNo() );
+        if (activitiesTmall == null){
+            throw new CustomException("天猫订单号不存在");
+        }
+        if (activitiesTmall.getIsExchange()==1){
+            throw new CustomException("对不起，该天猫订单号已经充值过");
+        }
         String price = configService.selectConfigByKey("activities_phone_bill");
         Double dprice = Double.valueOf(price);
         Double v =dprice* 100;
@@ -398,6 +409,11 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
 
     @Override
     public void buyPhoneBillOrder(WxOrder wxOrder) {
+        WxOrderCreatePhoneBillDTO wxOrderCreatePhoneBillDTO=JSONObject.parseObject(wxOrder.getOrderDataJson(),WxOrderCreatePhoneBillDTO.class);;
+        ActivitiesTmall activitiesTmall= activitiesTmallService.getByTmallNoWithPhoneBill(wxOrderCreatePhoneBillDTO.getTmallNo() );
+        activitiesTmall.setIsExchange(1);
+        activitiesTmall.setExchangeTime(new Date());
+        activitiesTmallService.updateById(activitiesTmall);
 //        wxOrder.setOrderStatus(OrderStatusEnum.SUCCESS.getCode());
         updateById(wxOrder);
     }

zzjs-service/src/main/resources/mapper/activities/ActivitiesTmallMapper.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.activities.mapper.ActivitiesTmallMapper">
+
+    <resultMap type="ActivitiesTmall" id="ActivitiesTmallResult">
+        <result property="id"    column="id"    />
+        <result property="tmallNo"    column="tmall_no"    />
+        <result property="isExchange"    column="is_exchange"    />
+        <result property="exchangeTime"    column="exchange_time"    />
+        <result property="activitiesType"    column="activities_type"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectActivitiesTmallVo">
+        select * from activities_tmall
+    </sql>
+
+    <select id="selectActivitiesTmallList" parameterType="ActivitiesTmall" resultMap="ActivitiesTmallResult">
+        <include refid="selectActivitiesTmallVo"/>
+        <where>
+            <if test="tmallNo != null  and tmallNo != ''"> and tmall_no = #{tmallNo}</if>
+            <if test="isExchange != null "> and is_exchange = #{isExchange}</if>
+            <if test="exchangeTime != null "> and exchange_time = #{exchangeTime}</if>
+            <if test="activitiesType != null "> and activities_type = #{activitiesType}</if>
+        </where>
+    </select>
+
+
+    <select id="getByTmallNoWithPhoneBill" parameterType="string" resultType="com.miaxis.activities.domain.ActivitiesTmall">
+        select * from activities_tmall
+        <where>
+            activities_type =1 and
+            tmall_no = #{tmallNo}
+        </where>
+    </select>
+
+</mapper>