修改生成订单接口

YijiaRestful/src/main/java/com/platform/yijia/controller/IntegralShoppingMallController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -125,14 +126,17 @@ public class IntegralShoppingMallController {
 
         //更新用户积分
         String surplusPoints ="";   //剩余积分
+        String orderSumIntegral ="";        //订单消费总积分
         CustomerPoints customerPointsInfo = customerPointsService.getCustomerPointsInfo(customerPoints);
         if(customerPointsInfo !=null){
+            BigDecimal multiply = new BigDecimal(request.getIntegral()).multiply(new BigDecimal(request.getExchangeNum())); //该订单总积分
+            orderSumIntegral = multiply.toString();
             //用户剩余积分
-            BigDecimal points = new BigDecimal(customerPointsInfo.getPoints()).subtract(new BigDecimal(request.getIntegral()));
+            BigDecimal points = new BigDecimal(customerPointsInfo.getPoints()).subtract(multiply);
+            customerPoints.setPoints(Integer.valueOf(points.toString()));
             surplusPoints = points.toString();
-            customerPoints.setPoints(Integer.valueOf(surplusPoints));
             //用户已消费积分累积
-            BigDecimal consumptionPoints = new BigDecimal(customerPointsInfo.getConsumptionPoints()).add(new BigDecimal(request.getIntegral()));
+            BigDecimal consumptionPoints = new BigDecimal(customerPointsInfo.getConsumptionPoints()).add(multiply);
             customerPoints.setConsumptionPoints(Integer.valueOf(consumptionPoints.toString()));
             customerPointsService.updateCustomerPointsInfo(customerPoints);
         }
@@ -172,7 +176,7 @@ public class IntegralShoppingMallController {
             wxMpTemplate.add(new WxMpTemplateData("keyword2", integralOrderNo));
             wxMpTemplate.add(new WxMpTemplateData("keyword3", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())));
             wxMpTemplate.add(new WxMpTemplateData("keyword4", request.getWaresName()));
-            wxMpTemplate.add(new WxMpTemplateData("keyword5", request.getIntegral().toString()));
+            wxMpTemplate.add(new WxMpTemplateData("keyword5", orderSumIntegral));
             wxMpTemplate.add(new WxMpTemplateData("remark",
                     "截止至" + new SimpleDateFormat(" yyyy年MM月dd日HH时mm分").format(new Date())+"，您在"+stationName+"的当前积分值还剩余 "+surplusPoints+" 分."));
             String templateId = "9EWrreI-P8r4xDgoOcczC4jHt1v0HEjKzkgVRDzoNXA";  //积分兑换成功通知
@@ -204,14 +208,14 @@ public class IntegralShoppingMallController {
     //获取用户积分订单列表
     @RequestMapping(value = "/getUserIntegralOrderList", method = RequestMethod.GET)
     @ResponseBody
-    public String getUserIntegralOrderList(@RequestParam String unionId){
+    public String getUserIntegralOrderList(@RequestParam String unionId, Integer stationId){
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
         if(unionId !=null){
             IntegralOrder integralOrder = new IntegralOrder();
             integralOrder.setUnionId(unionId);
-            //integralOrder.setStationId(stationId);
+            integralOrder.setStationId(stationId);
             List<IntegralOrder> integralOrderList = integralOrderService.getUserIntegralOrderList(integralOrder);
             resultData=ResultData.success(integralOrderList);
         }else {
@@ -223,14 +227,14 @@ public class IntegralShoppingMallController {
     //获取客户积分信息
     @RequestMapping(value = "/getCustomerPointsInfo", method = RequestMethod.GET)
     @ResponseBody
-    public String getCustomerPointsInfo(@RequestParam("unionId") String unionId){
+    public String getCustomerPointsInfo(@RequestParam String unionId, Integer stationId){
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
         if(unionId !=null){
             CustomerPoints customerPoints  =new CustomerPoints();
             customerPoints.setUnionId(unionId);
-            //customerPoints.setStationId(stationId);
+            customerPoints.setStationId(stationId);
             CustomerPoints customerPointsInfo = customerPointsService.getCustomerPointsInfo(customerPoints);
             resultData=ResultData.success(customerPointsInfo);
         }else {
@@ -242,14 +246,14 @@ public class IntegralShoppingMallController {
     //获取客户积分记录信息
     @RequestMapping(value = "/getCustomerPointsRecordList", method = RequestMethod.GET)
     @ResponseBody
-    public String getCustomerPointsRecordList(@RequestParam("unionId") String unionId){
+    public String getCustomerPointsRecordList(@RequestParam("unionId") String unionId, Integer stationId){
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
         if(unionId !=null){
             CustomerPointsRecord customerPointsRecord  =new CustomerPointsRecord();
             customerPointsRecord.setUnionId(unionId);
-            //customerPointsRecord.setStationId(stationId);
+            customerPointsRecord.setStationId(stationId);
             List<CustomerPointsRecord> customerPointsRecordList = customerPointsRecordService.getCustomerPointsRecordList(customerPointsRecord);
             resultData=ResultData.success(customerPointsRecordList);
         }else {

YijiaRestful/src/main/resources/mapper/CustomerPointsRecordMapper.xml

@@ -31,6 +31,7 @@
         AND station_id = #{stationId}
       </if>
     </where>
+    ORDER BY create_time DESC
   </select>
 
   <!--插入客户积分表-->

YijiaRestful/src/main/resources/mapper/IntegralOrderMapper.xml

@@ -3,18 +3,18 @@
 <mapper namespace="com.platform.yijia.dao.IntegralOrderMapper">
   <!--返回结果-->
   <resultMap id="BaseResultMap" type="com.platform.yijia.pojo.IntegralOrder">
-    <id     column="id"                 jdbcType="INTEGER" property="id" />
-    <result column="integral_order_no"  jdbcType="VARCHAR" property="integralOrderNo" />
-    <result column="wares_type"         jdbcType="VARCHAR" property="waresType" />
-    <result column="wares_name"         jdbcType="VARCHAR" property="waresName" />
-    <result column="wares_id"           jdbcType="INTEGER" property="waresId" />
-    <result column="union_id"           jdbcType="VARCHAR" property="unionId" />
-    <result column="customer_name"      jdbcType="VARCHAR" property="customerName" />
-    <result column="exchange_num"       jdbcType="INTEGER" property="exchangeNum" />
-    <result column="exchange_time"      jdbcType="DATE"    property="exchangeTime" />
-    <result column="status"             jdbcType="VARCHAR" property="status" />
-    <result column="integral"           jdbcType="INTEGER" property="integral" />
-    <result column="station_id"         jdbcType="INTEGER" property="stationId" />
+    <id     column="id"                 jdbcType="INTEGER"      property="id" />
+    <result column="integral_order_no"  jdbcType="VARCHAR"      property="integralOrderNo" />
+    <result column="wares_type"         jdbcType="VARCHAR"      property="waresType" />
+    <result column="wares_name"         jdbcType="VARCHAR"      property="waresName" />
+    <result column="wares_id"           jdbcType="INTEGER"      property="waresId" />
+    <result column="union_id"           jdbcType="VARCHAR"      property="unionId" />
+    <result column="customer_name"      jdbcType="VARCHAR"      property="customerName" />
+    <result column="exchange_num"       jdbcType="INTEGER"      property="exchangeNum" />
+    <result column="exchange_time"      jdbcType="TIMESTAMP"    property="exchangeTime" />
+    <result column="status"             jdbcType="VARCHAR"      property="status" />
+    <result column="integral"           jdbcType="INTEGER"      property="integral" />
+    <result column="station_id"         jdbcType="INTEGER"      property="stationId" />
   </resultMap>
 
   <!--查询列-->
@@ -32,7 +32,11 @@
       <if test="unionId !=null and unionId !=''">
         union_id = #{unionId}
       </if>
+      <if test="stationId !=null and stationId !=''">
+        AND station_id = #{stationId}
+      </if>
     </where>
+    ORDER BY exchange_time DESC
   </select>
 
   <!--新增积分订单-->