Merge branch 'master' of hyq/kmall-pt into master

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -690,7 +690,7 @@ public class OrderController {
 
         ExcelExport ee = new ExcelExport("订单信息");
 
-        String[] header = new String[]{"订单编号","商户订单编号", "订单状态", "保税模式", "快递公司名称", "快递单编号", "海关清单编号", "收货人姓名", "收件人手机", "收件人省份", "收件人城市", "收件人区县", "收件人地址", "下单时间", "实际支付金额", "SKU", "商品名称", "数量", "销售价"};
+        String[] header = new String[]{"订单编号","商户订单编号", "订单状态", "实际支付金额", "SKU", "商品名称", "数量", "销售价", "保税模式", "快递公司名称", "快递单编号", "海关清单编号", "收货人姓名", "收件人手机", "收件人省份", "收件人城市", "收件人区县", "收件人地址", "下单时间"};
 
         List<Map<String, Object>> list = new ArrayList<>();
         if (orderList != null && orderList.size() != 0) {
@@ -702,10 +702,16 @@ public class OrderController {
                 map.put("OrderSn", orderEntity.getOrderSn());
                 map.put("MerchOrderSn", orderEntity.getMerchOrderSn());
                 map.put("OrderStatus", StringUtils.isEmpty(orderStatus.toString())? "":Dict.orderStatus.valueOf("item_"+ orderStatus).getItemName());
+                map.put("ActualPrice", orderEntity.getActualPrice());
+                map.put("SKU", orderEntity.getSku());
+                map.put("GoodsName", orderEntity.getGoodsName());
+                map.put("Number", orderEntity.getNumber());
+                map.put("RetailPrice", orderEntity.getRetailPrice());
+
                 map.put("OrderBizType", StringUtils.isEmpty(orderBizType)? "":Dict.orderBizType.valueOf("item_"+orderBizType).getItemName());
                 map.put("ShippingName", orderEntity.getShippingName());
                 map.put("ShippingNo", orderEntity.getShippingNo());
-                map.put("InvtNo", orderEntity.getOrderProcessRecord().getInvtNo());
+                map.put("InvtNo", orderEntity.getOrderProcessRecord()==null?"":orderEntity.getOrderProcessRecord().getInvtNo());
                 map.put("Consignee", orderEntity.getConsignee());
                 map.put("Mobile", orderEntity.getMobile());
                 map.put("Province", orderEntity.getProvince());
@@ -714,14 +720,8 @@ public class OrderController {
                 map.put("Address", orderEntity.getAddress());
 
                 map.put("OrderStartTime", DateUtils.format(orderEntity.getOrderProcessRecord().getAddOrderStartTime(),"yyyy-MM-dd HH:mm:ss"));
-                map.put("ActualPrice", orderEntity.getActualPrice());
-                for (OrderGoodsEntity orderGoodsEntity : orderEntity.getOrderGoodsEntityList()) {
-                    map.put("SKU", orderGoodsEntity.getSku());
-                    map.put("GoodsName", orderGoodsEntity.getGoodsName());
-                    map.put("Number", orderGoodsEntity.getNumber());
-                    map.put("RetailPrice", orderGoodsEntity.getRetailPrice());
-                    list.add(map);
-                }
+
+                list.add(map);
             }
         }
 

kmall-admin/src/main/java/com/kmall/admin/entity/OrderEntity.java

@@ -134,6 +134,36 @@ public class OrderEntity implements Serializable {
     private String orderSnWx;
 
     private String isMergePay;
+    //商品名称
+    private String goodsName;
+    //商品数量
+    private Integer number;
+    //零售价格
+    private BigDecimal retailPrice;
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public BigDecimal getRetailPrice() {
+        return retailPrice;
+    }
+
+    public void setRetailPrice(BigDecimal retailPrice) {
+        this.retailPrice = retailPrice;
+    }
 
     public String getIsMergePay() {
         return isMergePay;

kmall-common/src/main/java/com/kmall/common/controller/SysLoginController.java

@@ -5,6 +5,7 @@ import com.google.code.kaptcha.Producer;
 import com.kmall.common.annotation.SysLog;
 import com.kmall.common.utils.R;
 import com.kmall.common.utils.ShiroUtils;
+import com.kmall.common.utils.redis.JedisUtil;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.apache.shiro.subject.Subject;
@@ -17,7 +18,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.imageio.ImageIO;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.HashSet;
@@ -34,9 +37,10 @@ import java.util.Set;
 public class SysLoginController {
     @Autowired
     private Producer producer;
+    public static int wsTokenExpireTime = 3600 * 24 * 30;
 
     @RequestMapping("captcha.jpg")
-    public void captcha(HttpServletResponse response) throws ServletException, IOException {
+    public void captcha(HttpServletResponse response, HttpSession session) throws ServletException, IOException {
         response.setHeader("Cache-Control", "no-store, no-cache");
         response.setContentType("image/jpeg");
 
@@ -45,7 +49,7 @@ public class SysLoginController {
         //生成图片验证码
         BufferedImage image = producer.createImage(text);
         //保存到shiro session
-        ShiroUtils.setSessionAttribute(Constants.KAPTCHA_SESSION_KEY, text);
+        JedisUtil.set(Constants.KAPTCHA_SESSION_KEY, text, wsTokenExpireTime);
 
         ServletOutputStream out = response.getOutputStream();
         ImageIO.write(image, "jpg", out);
@@ -57,8 +61,10 @@ public class SysLoginController {
     @SysLog("登录")
     @ResponseBody
     @RequestMapping(value = "/sys/login", method = RequestMethod.POST)
-    public R login(String username, String password, String captcha) throws IOException {
-        String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY);
+    public R login(String username, String password, String captcha,HttpSession session) throws IOException {
+        String kaptcha = (String) JedisUtil.get(Constants.KAPTCHA_SESSION_KEY);
+        System.out.println(kaptcha);
+        JedisUtil.del(Constants.KAPTCHA_SESSION_KEY);
         if (!captcha.equalsIgnoreCase(kaptcha)) {
             return R.error("验证码不正确");
         }