Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/java/com/uas/platform/b2c/common/lottery/controller/LotteryController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2c.common.lottery.controller;
 
+import com.uas.platform.b2c.common.lottery.service.ActivityItemService;
 import com.uas.platform.b2c.common.lottery.service.UserInfoService;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +20,12 @@ public class LotteryController {
 
     private final UserInfoService userInfoService;
 
+    private final ActivityItemService activityItemService;
+
     @Autowired
-    public LotteryController(UserInfoService userInfoService) {
+    public LotteryController(UserInfoService userInfoService, ActivityItemService activityItemService) {
         this.userInfoService = userInfoService;
+        this.activityItemService = activityItemService;
     }
 
     /**
@@ -33,4 +37,15 @@ public class LotteryController {
     public ResultMap findUserInfo(String activityCode) {
         return userInfoService.findUserInfo(activityCode);
     }
+
+    /**
+     * 获取当前等级信息、下一等级信息
+     * @param activityCode 活动编号
+     * @return
+     */
+    @RequestMapping(value = "/user/activityItems", method = RequestMethod.GET, produces = "application/json")
+    public ResultMap getActivityItems(String activityCode) {
+        return activityItemService.getActivityItems(activityCode);
+    }
+
 }

src/main/java/com/uas/platform/b2c/common/lottery/service/ActivityItemService.java

@@ -0,0 +1,18 @@
+package com.uas.platform.b2c.common.lottery.service;
+
+import com.uas.platform.b2c.trade.support.ResultMap;
+
+/**
+ * Created by wangyc on 2018/9/12.
+ *
+ * @version 2018/9/12 14:47 wangyc
+ */
+public interface ActivityItemService {
+
+    /**
+     * 获取当前等级信息、下一等级信息
+     * @param activityCode 活动编号
+     * @return
+     */
+    ResultMap getActivityItems(String activityCode);
+}

src/main/java/com/uas/platform/b2c/common/lottery/service/impl/ActivityItemServiceImpl.java

@@ -0,0 +1,53 @@
+package com.uas.platform.b2c.common.lottery.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.platform.b2c.common.lottery.service.ActivityItemService;
+import com.uas.platform.b2c.core.config.SysConf;
+import com.uas.platform.b2c.core.support.SystemSession;
+import com.uas.platform.b2c.trade.support.CodeType;
+import com.uas.platform.b2c.trade.support.ResultMap;
+import com.uas.platform.core.util.HttpUtil;
+import com.uas.platform.core.util.HttpUtil.Response;
+import java.util.HashMap;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+/**
+ * Created by wangyc on 2018/9/12.
+ *
+ * @version 2018/9/12 14:47 wangyc
+ */
+@Service
+public class ActivityItemServiceImpl implements ActivityItemService {
+
+    // 获取单个用户信息路径
+    private static final String GET_USER_URL = "/activityItem/user";
+
+    private final SysConf sysConf;
+
+    @Autowired
+    public ActivityItemServiceImpl(SysConf sysConf) {
+        this.sysConf = sysConf;
+    }
+
+    @Override
+    public ResultMap getActivityItems(String activityCode) {
+        if (StringUtils.isEmpty(activityCode)) {
+            return new ResultMap(CodeType.PARAMETER_ERROR, "活动信息不完全，请确认活动信息");
+        }
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("useruu", SystemSession.getUser().getUserUU());
+        params.put("enuu", SystemSession.getUser().getEnterprise() == null ? 0 : SystemSession.getUser().getEnterprise().getUu());
+        params.put("activityCode", activityCode);
+
+        try {
+            Response response = HttpUtil.sendGetRequest(sysConf.getLottery() + GET_USER_URL, params);
+            return JSON.parseObject(response.getResponseText(), ResultMap.class);
+        } catch (Exception e) {
+            return new ResultMap(CodeType.ERROR_STATE, "获取等级信息错误，请重试");
+        }
+    }
+}

src/main/java/com/uas/platform/b2c/prod/commodity/model/Goods.java

@@ -728,6 +728,9 @@ public class Goods implements Serializable {
 	}
 
 	public void setStatus() {
+		if (this.autoPublish == null) {
+			this.autoPublish = Boolean.TRUE;
+		}
 		if (this.autoPublish) {
 			if (StringUtils.isEmpty(this.packaging) || (this.minBuyQty == null) || (this.minPackQty == null) || (this.b2cMinDelivery == null) || (this.b2cMaxDelivery == null) || StringUtils.isEmpty(this.qtyPrice)) {
 				//做未上架处理

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseBomServiceImpl.java

@@ -685,15 +685,38 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
             return map;
         }
         try {
+            Date now = new Date();
+            List<Product> products = new ArrayList<>();
+            Integer newAmount = 0;
             List<SeekPurchaseByBatch> seekPurchaseByBatches = bom.getSeekPurchaseByBatchs();
             if (!CollectionUtils.isEmpty(seekPurchaseByBatches)) {
                 for (SeekPurchaseByBatch batch : seekPurchaseByBatches) {
+                    if (null == batch.getId()) {
+                        newAmount++;
+                    }
                     if (null == batch.getAmount()) {
                         batch.setAmount(1d);
                     }
+                    batch.setReleaseDate(now);
+                    Product product = new Product();
+                    if (CollectionUtils.isEmpty(productDao.findProductByPcmpcodeAndPbrandenAndEnUU(batch.getCode(), batch.getBrand(), SystemSession.getUser().getEnterprise().getUu()))){
+                        product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+                        product.setUserUU(SystemSession.getUser().getUserUU());
+                        product.setProdNum(System.currentTimeMillis() + StringUtilB2C.getRandomNumber(5));
+                        product.setBrand(batch.getBrand());
+                        product.setCmpCode(batch.getCode());
+                        product.setPbranden(batch.getBrand());
+                        product.setPcmpcode(batch.getCode());
+                        product.setSpec(batch.getSpec());
+                        product.setProdName(batch.getKind());
+                        product.setKind(batch.getKind());
+                        products.add(product);
+                    }
                 }
                 seekPurchaseByBatchDao.save(seekPurchaseByBatches);
+                productDao.save(products);
             }
+            bom.setAmount(bom.getAmount() + newAmount);
             seekPurchaseBomDao.save(bom);
             map.put("success", true);
         } catch (Exception e) {
@@ -905,7 +928,7 @@ public class SeekPurchaseBomServiceImpl implements SeekPurchaseBomService {
                 newProduct.setReleaseDate(now);
                 //如果该物料在物料表中不存在，则将新增物料添加到物料表中
                 Product product = new Product();
-                if (!CollectionUtils.isEmpty(productDao.findProductByPcmpcodeAndPbrandenAndEnUU(newProduct.getCode(), newProduct.getBrand(), SystemSession.getUser().getEnterprise().getUu()))){
+                if (CollectionUtils.isEmpty(productDao.findProductByPcmpcodeAndPbrandenAndEnUU(newProduct.getCode(), newProduct.getBrand(), SystemSession.getUser().getEnterprise().getUu()))){
                     product.setEnUU(SystemSession.getUser().getEnterprise().getUu());
                     product.setUserUU(SystemSession.getUser().getUserUU());
                     product.setProdNum(System.currentTimeMillis() + StringUtilB2C.getRandomNumber(5));

src/main/webapp/resources/view/admin/trade/trade_invoicefromorder.html

@@ -224,8 +224,8 @@ input[type="radio"]:checked+label:after, input[type="checkbox"]:checked+label:af
 							<td class="text-center">{{invoice.buyername}}</td>
 							<td class="text-center text-num">{{invoice.currency}}
 								{{invoice.price}}</td>
-							<td class="text-center">{{invoice.number}}</td>
-							<td class="text-center">{{invoice.creattime | date:"yyyy-MM-dd HH:mm"}}</td>
+							<td class="text-center">{{invoice.qty}}</td>
+							<td class="text-center">{{invoice.createtime | date:"yyyy-MM-dd HH:mm"}}</td>
 							<td class="text-center">{{invoice.status |statusAndTypeFilter}}</td>
 							<td class="text-center">{{invoice.sourceid}}</td>
 							<td class="text-center" ng-show="active=='tobeshipped'">

src/main/webapp/resources/view/admin/trade/trade_invoicefrompurc.html

@@ -56,8 +56,8 @@
 							<td class="text-center"><span ng-bind="invoice.selfSeller ? '自营' : '代售'"></span></td>
 							<td class="text-center">{{invoice.sellername}}</td>
 							<td class="text-center text-num">{{invoice.currencyName}} {{invoice.price}}</td>
-							<td class="text-center">{{invoice.number}}</td>
-							<td class="text-center">{{invoice.creattime | date: "yyyy-MM-dd HH:mm"}}</td>
+							<td class="text-center">{{invoice.qty}}</td>
+							<td class="text-center">{{invoice.createtime | date: "yyyy-MM-dd HH:mm"}}</td>
 							<td class="text-center">{{invoice.orid}}</td>
 							<td class="text-center" ng-show="active=='inbound'">
 								<a ng-show="active=='inbound'" ng-click="ensureAccept(invoice)">