瀏覽代碼

修改订单商品数默认为1的设定

litianbiao 2 年之前
父節點
當前提交
c1bdc5ae41

+ 5 - 1
src/main/java/com/szwl/controller/TCoinOrderController.java

@@ -73,7 +73,11 @@ public class TCoinOrderController {
         coinOrder.setPrice(price);
         coinOrder.setProductNo(coinOrderVo.getNo());
         coinOrder.setSn(sn);
-        coinOrder.setProductNumber(coinOrderVo.getProductNumber());
+        if(coinOrderVo.getProductNumber()==null||coinOrderVo.getProductNumber()==0){
+            coinOrderVo.setProductNumber(1);
+        }else {
+            coinOrder.setProductNumber(coinOrderVo.getProductNumber());
+        }
         if(StringUtils.isNotEmpty(coinOrderVo.getCreateDate())){
             java.text.SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss");
             Date date1 = null;

+ 9 - 0
src/main/java/com/szwl/controller/TOrderController.java

@@ -2589,6 +2589,9 @@ public class TOrderController {
             //传送数据
             sentJingZhun(order);
             try {
+                if(order.getProductNumber()==null||order.getProductNumber()==0){
+                    order.setProductNumber(1);
+                }
                 esTOrderService.insertData(order);
             }catch (Exception e) {
                 e.printStackTrace();
@@ -2746,6 +2749,9 @@ public class TOrderController {
             order.setNote(gtClientId + "已推送");
 
             try {
+                if(order.getProductNumber()==null||order.getProductNumber()==0){
+                    order.setProductNumber(1);
+                }
                 esTOrderService.insertData(order);
             }catch (Exception e) {
                 e.printStackTrace();
@@ -3371,6 +3377,9 @@ public class TOrderController {
         order.setType(type);
         orderService.save(order);
         try {
+            if(order.getProductNumber()==null||order.getProductNumber()==0){
+                order.setProductNumber(1);
+            }
             esTOrderService.insertData(order);
         }catch (Exception e) {
             e.printStackTrace();

+ 1 - 1
src/main/java/com/szwl/model/entity/TCoinOrder.java

@@ -49,6 +49,6 @@ public class TCoinOrder implements Serializable {
 
     private Date payDate;
 
-    private Integer productNumber = 1;
+    private Integer productNumber;
 
 }

+ 1 - 1
src/main/java/com/szwl/model/entity/TOrder.java

@@ -100,5 +100,5 @@ public class TOrder implements Serializable {
 
     private String coupons;
 
-    private Integer productNumber = 1;
+    private Integer productNumber;
 }

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ spring:
     name: pay-server
   profiles:
     # 打包或运行时,换这里:sit测试,prod正式
-    active: prod
+    active: sit
   cloud:
     config:
       name: pay-server