订单管理修改

src/main/java/com/caimei/modules/club/controller/CmUserOrganizeController.java

@@ -49,7 +49,7 @@ public class CmUserOrganizeController {
      */
     @ResponseBody
     @RequestMapping(value = "/toAddClubUser")
-    public JsonModel toAddClubUser(CmUserOrganize cmUserOrganize, NewCmClub newCmClub) {
+    public JsonModel toAddClubUser(NewCmClub newCmClub) {
         if (null != newCmClub.getClubID()) {
             newCmClub = newCmClubService.findClubById(newCmClub.getClubID());
         }
@@ -182,7 +182,7 @@ public class CmUserOrganizeController {
         cmUser.setRegisterTime(curTime);
         cmUser.setLoginTime(curTime);
         cmUser.setAccount(newCmClub.getContractMobile() + RandomCodeGenerator.generateAccount(2));
-        cmUser.setPassword(MD5Util.MD5("caimei123"));
+        cmUser.setPassword(MD5Util.md5("caimei123"));
         cmUser.setBindMobile(newCmClub.getContractMobile());
         cmUser.setUserName(newCmClub.getName());
         cmUser.setEmailCheckFlag("0");

src/main/java/com/caimei/modules/club/entity/CmUser.java

@@ -2,7 +2,6 @@ package com.caimei.modules.club.entity;
 
 import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotNull;
 import java.beans.Transient;
 import java.io.Serializable;
 
@@ -15,7 +14,6 @@ import java.io.Serializable;
 public class CmUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    private Integer id;
     private Integer userID;        // userID
     private Integer userOrganizeID;//用户组织ID
     private String mobile;        // 手机号码
@@ -106,15 +104,6 @@ public class CmUser implements Serializable {
     private String province; //省
     private String address;        // 详细地址
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    @NotNull(message = "userID不能为空")
     public Integer getUserID() {
         return userID;
     }

src/main/java/com/caimei/modules/order/controller/OrganizeOrderController.java

@@ -8,14 +8,11 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
 

src/main/java/com/caimei/modules/order/entity/BpClause.java

@@ -1,7 +1,5 @@
 package com.caimei.modules.order.entity;
 
-import org.hibernate.validator.constraints.Length;
-
 import java.io.Serializable;
 
 /**

src/main/java/com/caimei/modules/order/entity/NewOrder.java

@@ -1,6 +1,6 @@
 package com.caimei.modules.order.entity;
 
-import java.beans.Transient;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -8,7 +8,7 @@ import java.util.List;
  * @date 2018-07-24
  * @description 主订单表
  */
-public class NewOrder{
+public class NewOrder implements Serializable {
     private Integer orderID;             // bigint(11) not null,
     private String orderNo;             // varchar(30) comment '订单编号',
     private Integer userID;              // bigint(11), 订单归属人
@@ -50,8 +50,8 @@ public class NewOrder{
     private List<NewShopOrder> newShopOrders;
     private OrderUserInfo bpOrderUserinfo; //订单用户信息表
     private OrderInvoice orderInvoice;
-    private Integer productCount;		// 商品总数
-    private Integer presentCount;		// 赠送总数
+    private Integer productCount;        // 商品总数
+    private Integer presentCount;        // 赠送总数
     private String payTime; //订单支付时间
     private String payFlag;//是否已支付 未支付0 已支付1
     private String onlinePayFlag;//能否显示支付 ：0 能线上 1 线下
@@ -69,7 +69,7 @@ public class NewOrder{
     private Double totalDiscount;//订单退款已退的经理折扣金额
     // -----------------  v5.0.0 end
 
-  //-------------        虚拟字段   ----------------------------
+    //-------------        虚拟字段   ----------------------------
     private String shopName;            //供应商
     private String receiver;//收货人
     private String buyer;//买家
@@ -99,37 +99,6 @@ public class NewOrder{
     private String shopOrderNo;//       varchar(30) comment '子订单编号'
     private String toAudit;   //有没有收款待审核的订单 , 有的1
 
-    public Integer getOrganizeID() {
-        return organizeID;
-    }
-    public void setOrganizeID(Integer organizeID) {
-        this.organizeID = organizeID;
-    }
-
-    public String getToAudit() {
-        return toAudit;
-    }
-
-    public void setToAudit(String toAudit) {
-        this.toAudit = toAudit;
-    }
-
-    public String[] getPs() {
-        return ps;
-    }
-
-    public void setPs(String[] ps) {
-        this.ps = ps;
-    }
-
-    public String getShopOrderNo() {
-        return shopOrderNo;
-    }
-
-    public void setShopOrderNo(String shopOrderNo) {
-        this.shopOrderNo = shopOrderNo;
-    }
-
     public Integer getOrderID() {
         return orderID;
     }
@@ -138,22 +107,6 @@ public class NewOrder{
         this.orderID = orderID;
     }
 
-    public Double getShouldPayProduct() {
-        return shouldPayProduct;
-    }
-
-    public void setShouldPayProduct(Double shouldPayProduct) {
-        this.shouldPayProduct = shouldPayProduct;
-    }
-
-    public String getSearchflag() {
-        return searchflag;
-    }
-
-    public void setSearchflag(String searchflag) {
-        this.searchflag = searchflag;
-    }
-
     public String getOrderNo() {
         return orderNo;
     }
@@ -170,6 +123,14 @@ public class NewOrder{
         this.userID = userID;
     }
 
+    public Integer getOrganizeID() {
+        return organizeID;
+    }
+
+    public void setOrganizeID(Integer organizeID) {
+        this.organizeID = organizeID;
+    }
+
     public String getShopOrderIDs() {
         return shopOrderIDs;
     }
@@ -202,6 +163,22 @@ public class NewOrder{
         this.productTotalFee = productTotalFee;
     }
 
+    public Double getShouldPayProduct() {
+        return shouldPayProduct;
+    }
+
+    public void setShouldPayProduct(Double shouldPayProduct) {
+        this.shouldPayProduct = shouldPayProduct;
+    }
+
+    public String getHasActProduct() {
+        return hasActProduct;
+    }
+
+    public void setHasActProduct(String hasActProduct) {
+        this.hasActProduct = hasActProduct;
+    }
+
     public Double getOrderTotalFee() {
         return orderTotalFee;
     }
@@ -210,6 +187,14 @@ public class NewOrder{
         this.orderTotalFee = orderTotalFee;
     }
 
+    public Double getPayableAmount() {
+        return payableAmount;
+    }
+
+    public void setPayableAmount(Double payableAmount) {
+        this.payableAmount = payableAmount;
+    }
+
     public Double getPayTotalFee() {
         return payTotalFee;
     }
@@ -306,6 +291,14 @@ public class NewOrder{
         this.orderTime = orderTime;
     }
 
+    public String getConfirmTime() {
+        return confirmTime;
+    }
+
+    public void setConfirmTime(String confirmTime) {
+        this.confirmTime = confirmTime;
+    }
+
     public String getCooFreeFlag() {
         return cooFreeFlag;
     }
@@ -378,14 +371,6 @@ public class NewOrder{
         this.freight = freight;
     }
 
-//    public Integer getFreePostageTicketID() {
-//        return freePostageTicketID;
-//    }
-//
-//    public void setFreePostageTicketID(Integer freePostageTicketID) {
-//        this.freePostageTicketID = freePostageTicketID;
-//    }
-
     public Integer getBuyUserID() {
         return buyUserID;
     }
@@ -410,6 +395,14 @@ public class NewOrder{
         this.newShopOrders = newShopOrders;
     }
 
+    public OrderUserInfo getBpOrderUserinfo() {
+        return bpOrderUserinfo;
+    }
+
+    public void setBpOrderUserinfo(OrderUserInfo bpOrderUserinfo) {
+        this.bpOrderUserinfo = bpOrderUserinfo;
+    }
+
     public OrderInvoice getOrderInvoice() {
         return orderInvoice;
     }
@@ -434,42 +427,118 @@ public class NewOrder{
         this.presentCount = presentCount;
     }
 
-    @Transient
-    public List<NewOrderProduct> getOrderProduct() {
-        return orderProduct;
+    public String getPayTime() {
+        return payTime;
     }
 
-    public void setOrderProduct(List<NewOrderProduct> orderProduct) {
-        this.orderProduct = orderProduct;
+    public void setPayTime(String payTime) {
+        this.payTime = payTime;
     }
 
-    @Transient
-    public String getBuyerName() {
-        return buyerName;
+    public String getPayFlag() {
+        return payFlag;
     }
 
-    public void setBuyerName(String buyerName) {
-        this.buyerName = buyerName;
+    public void setPayFlag(String payFlag) {
+        this.payFlag = payFlag;
     }
 
-    @Transient
-    public String getStartTime() {
-        return startTime;
+    public String getOnlinePayFlag() {
+        return onlinePayFlag;
     }
 
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
+    public void setOnlinePayFlag(String onlinePayFlag) {
+        this.onlinePayFlag = onlinePayFlag;
     }
 
-    @Transient
-    public String getEndTime() {
-        return endTime;
+    public Double getPreferential() {
+        return preferential;
     }
 
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
+    public void setPreferential(Double preferential) {
+        this.preferential = preferential;
+    }
+
+    public String getSplitFlag() {
+        return splitFlag;
+    }
+
+    public void setSplitFlag(String splitFlag) {
+        this.splitFlag = splitFlag;
+    }
+
+    public String getCloseReason() {
+        return closeReason;
+    }
+
+    public void setCloseReason(String closeReason) {
+        this.closeReason = closeReason;
+    }
+
+    public String getInvoiceFlag() {
+        return invoiceFlag;
+    }
+
+    public void setInvoiceFlag(String invoiceFlag) {
+        this.invoiceFlag = invoiceFlag;
+    }
+
+    public String getReceiptStatus() {
+        return receiptStatus;
+    }
+
+    public void setReceiptStatus(String receiptStatus) {
+        this.receiptStatus = receiptStatus;
+    }
+
+    public String getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(String payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    public String getSendOutStatus() {
+        return sendOutStatus;
+    }
+
+    public void setSendOutStatus(String sendOutStatus) {
+        this.sendOutStatus = sendOutStatus;
+    }
+
+    public String getRefundType() {
+        return refundType;
+    }
+
+    public void setRefundType(String refundType) {
+        this.refundType = refundType;
+    }
+
+    public String getPostageOrderFlag() {
+        return postageOrderFlag;
+    }
+
+    public void setPostageOrderFlag(String postageOrderFlag) {
+        this.postageOrderFlag = postageOrderFlag;
+    }
+
+    public Double getPaidAmount() {
+        return paidAmount;
+    }
+
+    public void setPaidAmount(Double paidAmount) {
+        this.paidAmount = paidAmount;
+    }
+
+    public Double getTotalDiscount() {
+        return totalDiscount;
+    }
+
+    public void setTotalDiscount(Double totalDiscount) {
+        this.totalDiscount = totalDiscount;
     }
-    @Transient
+
     public String getShopName() {
         return shopName;
     }
@@ -477,7 +546,7 @@ public class NewOrder{
     public void setShopName(String shopName) {
         this.shopName = shopName;
     }
-    @Transient
+
     public String getReceiver() {
         return receiver;
     }
@@ -485,7 +554,7 @@ public class NewOrder{
     public void setReceiver(String receiver) {
         this.receiver = receiver;
     }
-    @Transient
+
     public String getBuyer() {
         return buyer;
     }
@@ -493,7 +562,7 @@ public class NewOrder{
     public void setBuyer(String buyer) {
         this.buyer = buyer;
     }
-    @Transient
+
     public String getAlreadyReceipt() {
         return alreadyReceipt;
     }
@@ -501,7 +570,7 @@ public class NewOrder{
     public void setAlreadyReceipt(String alreadyReceipt) {
         this.alreadyReceipt = alreadyReceipt;
     }
-    @Transient
+
     public String getUnReceipt() {
         return unReceipt;
     }
@@ -509,7 +578,7 @@ public class NewOrder{
     public void setUnReceipt(String unReceipt) {
         this.unReceipt = unReceipt;
     }
-    @Transient
+
     public String getPaid() {
         return paid;
     }
@@ -517,7 +586,7 @@ public class NewOrder{
     public void setPaid(String paid) {
         this.paid = paid;
     }
-    @Transient
+
     public String getUnpaid() {
         return unpaid;
     }
@@ -525,7 +594,7 @@ public class NewOrder{
     public void setUnpaid(String unpaid) {
         this.unpaid = unpaid;
     }
-    @Transient
+
     public String getBrokerage() {
         return brokerage;
     }
@@ -534,31 +603,14 @@ public class NewOrder{
         this.brokerage = brokerage;
     }
 
-    public OrderUserInfo getBpOrderUserinfo() {
-        return bpOrderUserinfo;
-    }
-
-    public void setBpOrderUserinfo(OrderUserInfo bpOrderUserinfo) {
-        this.bpOrderUserinfo = bpOrderUserinfo;
-    }
-
-    public String getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(String payTime) {
-        this.payTime = payTime;
-    }
-
-    public Double getPreferential() {
-        return preferential;
+    public String getBuyerName() {
+        return buyerName;
     }
 
-    public void setPreferential(Double preferential) {
-        this.preferential = preferential;
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
     }
 
-    @Transient
     public String getMobile() {
         return mobile;
     }
@@ -566,7 +618,7 @@ public class NewOrder{
     public void setMobile(String mobile) {
         this.mobile = mobile;
     }
-    @Transient
+
     public String getAddress() {
         return address;
     }
@@ -574,65 +626,47 @@ public class NewOrder{
     public void setAddress(String address) {
         this.address = address;
     }
-    @Transient
-    public String getSplitFlag() {
-        return splitFlag;
-    }
-
-    public void setSplitFlag(String splitFlag) {
-        this.splitFlag = splitFlag;
-    }
-
-    @Transient
-    public Double getTotalAddedValueTax() {
-        return totalAddedValueTax;
-    }
 
-    public void setTotalAddedValueTax(Double totalAddedValueTax) {
-        this.totalAddedValueTax = totalAddedValueTax;
-    }
-
-    public String getPayFlag() {
-        return payFlag;
+    public String getStartTime() {
+        return startTime;
     }
 
-    public void setPayFlag(String payFlag) {
-        this.payFlag = payFlag;
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
     }
 
-    public String getOnlinePayFlag() {
-        return onlinePayFlag;
+    public String getEndTime() {
+        return endTime;
     }
 
-    public void setOnlinePayFlag(String onlinePayFlag) {
-        this.onlinePayFlag = onlinePayFlag;
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
     }
 
-    public String getHasActProduct() {
-        return hasActProduct;
+    public String getStartRefundTime() {
+        return startRefundTime;
     }
 
-    public void setHasActProduct(String hasActProduct) {
-        this.hasActProduct = hasActProduct;
+    public void setStartRefundTime(String startRefundTime) {
+        this.startRefundTime = startRefundTime;
     }
 
-    public String getConfirmTime() {
-        return confirmTime;
+    public String getEndRefundTime() {
+        return endRefundTime;
     }
 
-    public void setConfirmTime(String confirmTime) {
-        this.confirmTime = confirmTime;
+    public void setEndRefundTime(String endRefundTime) {
+        this.endRefundTime = endRefundTime;
     }
 
-    public String getCloseReason() {
-        return closeReason;
+    public Double getTotalAddedValueTax() {
+        return totalAddedValueTax;
     }
 
-    public void setCloseReason(String closeReason) {
-        this.closeReason = closeReason;
+    public void setTotalAddedValueTax(Double totalAddedValueTax) {
+        this.totalAddedValueTax = totalAddedValueTax;
     }
 
-    @Transient
     public String getShopNameInfo() {
         return shopNameInfo;
     }
@@ -641,76 +675,52 @@ public class NewOrder{
         this.shopNameInfo = shopNameInfo;
     }
 
-    public String getInvoiceFlag() {
-        return invoiceFlag;
-    }
-
-    public void setInvoiceFlag(String invoiceFlag) {
-        this.invoiceFlag = invoiceFlag;
-    }
-
-    public Double getPayableAmount() {
-        return payableAmount;
-    }
-
-    public void setPayableAmount(Double payableAmount) {
-        this.payableAmount = payableAmount;
-    }
-
-    public String getReceiptStatus() {
-        return receiptStatus;
-    }
-
-    public void setReceiptStatus(String receiptStatus) {
-        this.receiptStatus = receiptStatus;
-    }
-
-    public String getPayStatus() {
-        return payStatus;
+    public String getOrderRefundType() {
+        return orderRefundType;
     }
 
-    public void setPayStatus(String payStatus) {
-        this.payStatus = payStatus;
+    public void setOrderRefundType(String orderRefundType) {
+        this.orderRefundType = orderRefundType;
     }
 
-    public String getSendOutStatus() {
-        return sendOutStatus;
+    public String getReturnedPurchaseStatus() {
+        return returnedPurchaseStatus;
     }
 
-    public void setSendOutStatus(String sendOutStatus) {
-        this.sendOutStatus = sendOutStatus;
+    public void setReturnedPurchaseStatus(String returnedPurchaseStatus) {
+        this.returnedPurchaseStatus = returnedPurchaseStatus;
     }
 
-    public String getRefundType() {
-        return refundType;
+    public String getApplyReturnedPurchaseFlag() {
+        return applyReturnedPurchaseFlag;
     }
 
-    public void setRefundType(String refundType) {
-        this.refundType = refundType;
+    public void setApplyReturnedPurchaseFlag(String applyReturnedPurchaseFlag) {
+        this.applyReturnedPurchaseFlag = applyReturnedPurchaseFlag;
     }
 
-    public String getStartRefundTime() {
-        return startRefundTime;
+    public String getSpName() {
+        return spName;
     }
 
-    public void setStartRefundTime(String startRefundTime) {
-        this.startRefundTime = startRefundTime;
+    public void setSpName(String spName) {
+        this.spName = spName;
     }
 
-    public String getEndRefundTime() {
-        return endRefundTime;
+    public List<NewOrderProduct> getOrderProduct() {
+        return orderProduct;
     }
 
-    public void setEndRefundTime(String endRefundTime) {
-        this.endRefundTime = endRefundTime;
+    public void setOrderProduct(List<NewOrderProduct> orderProduct) {
+        this.orderProduct = orderProduct;
     }
 
-    public String getOrderRefundType() {
-        return orderRefundType;
+    public String getSearchflag() {
+        return searchflag;
     }
 
-    public void setOrderRefundType(String orderRefundType) {
-        this.orderRefundType = orderRefundType;
+    public void setSearchflag(String searchflag) {
+        this.searchflag = searchflag;
     }
 
     public String[] getShopNote() {
@@ -721,15 +731,6 @@ public class NewOrder{
         this.shopNote = shopNote;
     }
 
-    public String getPostageOrderFlag() {
-        return postageOrderFlag;
-    }
-
-    public void setPostageOrderFlag(String postageOrderFlag) {
-        this.postageOrderFlag = postageOrderFlag;
-    }
-
-    @Transient
     public String getRebateOrder() {
         return rebateOrder;
     }
@@ -737,45 +738,29 @@ public class NewOrder{
     public void setRebateOrder(String rebateOrder) {
         this.rebateOrder = rebateOrder;
     }
-    @Transient
-    public String getReturnedPurchaseStatus() {
-        return returnedPurchaseStatus;
-    }
 
-    public void setReturnedPurchaseStatus(String returnedPurchaseStatus) {
-        this.returnedPurchaseStatus = returnedPurchaseStatus;
-    }
-    @Transient
-    public String getSpName() {
-        return spName;
+    public String[] getPs() {
+        return ps;
     }
 
-    public void setSpName(String spName) {
-        this.spName = spName;
+    public void setPs(String[] ps) {
+        this.ps = ps;
     }
 
-    public String getApplyReturnedPurchaseFlag() {
-        return applyReturnedPurchaseFlag;
+    public String getShopOrderNo() {
+        return shopOrderNo;
     }
 
-    public void setApplyReturnedPurchaseFlag(String applyReturnedPurchaseFlag) {
-        this.applyReturnedPurchaseFlag = applyReturnedPurchaseFlag;
-    }
-    @Transient
-    public Double getPaidAmount() {
-        return paidAmount;
+    public void setShopOrderNo(String shopOrderNo) {
+        this.shopOrderNo = shopOrderNo;
     }
 
-    public void setPaidAmount(Double paidAmount) {
-        this.paidAmount = paidAmount;
-    }
-    @Transient
-    public Double getTotalDiscount() {
-        return totalDiscount;
+    public String getToAudit() {
+        return toAudit;
     }
 
-    public void setTotalDiscount(Double totalDiscount) {
-        this.totalDiscount = totalDiscount;
+    public void setToAudit(String toAudit) {
+        this.toAudit = toAudit;
     }
 }
 

src/main/java/com/caimei/modules/order/service/impl/NewOrderServiceImpl.java

@@ -45,7 +45,6 @@ public class NewOrderServiceImpl implements NewOrderService {
     public Page<NewOrder> findList(NewOrder newOrder, Page page) {
         PageHelper.startPage(page.getIndex(), page.getPageSize());
         List<NewOrder> orderList = newOrderDao.findList(newOrder);
-        Page<NewOrder> orderPage = new Page<>(orderList);
         List<Integer> oId = orderList.stream().map(NewOrder::getOrderID).collect(Collectors.toList());
         //看看这些订单有哪些是返佣订单 返回他们的orderID
         List<Integer> orderIds = null;
@@ -116,6 +115,7 @@ public class NewOrderServiceImpl implements NewOrderService {
                 order.setSplitFlag("0");
             }
         }
+        Page<NewOrder> orderPage = new Page<>(orderList);
         return orderPage;
     }
 

src/main/java/com/caimei/modules/products/controller/CmMallOrganizeProductsController.java

@@ -87,7 +87,7 @@ public class CmMallOrganizeProductsController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "saveEditProductInfo",method = RequestMethod.POST)
+    @RequestMapping(value = "saveEditProductInfo", method = RequestMethod.POST)
     public JsonModel saveEditProductInfo(@RequestBody CmMallOrganizeProducts cmMallOrganizeProducts) {
         JsonModel jsonModel = JsonModel.newInstance();
         try {
@@ -215,8 +215,8 @@ public class CmMallOrganizeProductsController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "canncelProduct")
-    public JsonModel canncelProduct(CmMallOrganizeProducts cmMallOrganizeProducts) {
+    @RequestMapping(value = "canncelProduct", method = RequestMethod.POST)
+    public JsonModel canncelProduct(@RequestBody CmMallOrganizeProducts cmMallOrganizeProducts) {
         cmMallOrganizeProducts.setUpdateTime(new Date());
         cmMallOrganizeProductsService.canncelPreferredProduct(cmMallOrganizeProducts);
         return JsonModel.newInstance().success();

src/main/java/com/caimei/modules/shiro/controller/ShiroController.java

@@ -9,6 +9,9 @@ import com.caimei.utils.TokenEncryptUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
 
 @RestController
 @RequestMapping("/user")
@@ -27,7 +30,7 @@ public class ShiroController {
         //用户信息
         CmMallAdminUser user = shiroService.findByUsername(adminUser.getAccount(), adminUser.getOrganizeID());
         //账号不存在、密码错误
-        if (user == null || !user.getPassword().equals(MD5Util.MD5(adminUser.getPassword()))) {
+        if (user == null || !user.getPassword().equals(MD5Util.md5(adminUser.getPassword()))) {
             return jsonModel.error("账号或密码有误");
         } else {
             //生成token
@@ -55,6 +58,38 @@ public class ShiroController {
         CmMallAdminUser user = shiroService.findByUserId(Integer.valueOf(tokens[1]));
         return JsonModel.newInstance().success(user);
     }
+
+    /**
+     * 修改密码
+     */
+    @RequestMapping(value = "changePassword", method = RequestMethod.POST)
+    public JsonModel changePassword(@RequestBody CmMallAdminUser adminUser, HttpServletRequest httpRequest) {
+        JsonModel jsonModel = JsonModel.newInstance();
+        String token = httpRequest.getHeader("token");
+        String decoded = TokenEncryptUtils.decoded(token);
+        String[] tokens = decoded.split("#,#");
+        CmMallAdminUser user = shiroService.findByUserId(Integer.valueOf(tokens[1]));
+        String oldPassword = MD5Util.md5(adminUser.getOldPassword() + user.getSalt());
+        if (user.getPassword().equals(oldPassword)) {
+            String salt = MD5Util.salt();
+            String password = MD5Util.md5(adminUser.getPassword() + salt);
+            user.setPassword(password);
+            user.setSalt(salt);
+            user.setUpdateTime(new Date());
+            shiroService.changePassword(user);
+            return jsonModel.success();
+        }
+        return jsonModel.error("旧密码输入不正确,请重新输入");
+    }
+
+    /**
+     * 组织信息数据
+     */
+    @RequestMapping("organizeInfo")
+    public JsonModel organizeInfo(Integer id) {
+        CmMallAdminUser mallAdminUser = shiroService.findOrganize(id);
+        return JsonModel.newInstance().success(mallAdminUser);
+    }
 }
 
 

src/main/java/com/caimei/modules/shiro/dao/UserDao.java

@@ -10,4 +10,8 @@ public interface UserDao {
     CmMallAdminUser findByUsername(@Param("account") String account, @Param("organizeID") Integer organizeID);
 
     CmMallAdminUser findByUserId(Integer id);
+
+    void changePassword(CmMallAdminUser user);
+
+    CmMallAdminUser findOrganize(Integer id);
 }

src/main/java/com/caimei/modules/shiro/entity/CmMallAdminUser.java

@@ -12,6 +12,7 @@ public class CmMallAdminUser {
     private Date addTime;
     private Date updateTime;
     private Set<Role> roles;
+    private String oldPassword;
 
     public String getSalt() {
         return salt;
@@ -76,4 +77,12 @@ public class CmMallAdminUser {
     public void setRoles(Set<Role> roles) {
         this.roles = roles;
     }
+
+    public String getOldPassword() {
+        return oldPassword;
+    }
+
+    public void setOldPassword(String oldPassword) {
+        this.oldPassword = oldPassword;
+    }
 }

src/main/java/com/caimei/modules/shiro/entity/CmMallOrganize.java

@@ -0,0 +1,105 @@
+package com.caimei.modules.shiro.entity;
+
+import java.io.Serializable;
+
+public class CmMallOrganize implements Serializable {
+    private Integer id;
+    private String organizeName;        //组织名称
+    private String organizeLinkName;    //组织联系人
+    private String mobile;          //手机号码
+    private String contactNumber;   //联系我们，手机或者座机号码
+    private String introduction;    //关于我们:组织介绍信息
+    private String afterSale;       //售后无忧
+    private String shoppingNotes;   //购物须知
+    private String updateTime;      //更新时间
+    private String addTime;         //添加时间
+    private String delFlag;     //0 有效 其它无效
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getOrganizeName() {
+        return organizeName;
+    }
+
+    public void setOrganizeName(String organizeName) {
+        this.organizeName = organizeName;
+    }
+
+    public String getOrganizeLinkName() {
+        return organizeLinkName;
+    }
+
+    public void setOrganizeLinkName(String organizeLinkName) {
+        this.organizeLinkName = organizeLinkName;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getContactNumber() {
+        return contactNumber;
+    }
+
+    public void setContactNumber(String contactNumber) {
+        this.contactNumber = contactNumber;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+
+    public String getAfterSale() {
+        return afterSale;
+    }
+
+    public void setAfterSale(String afterSale) {
+        this.afterSale = afterSale;
+    }
+
+    public String getShoppingNotes() {
+        return shoppingNotes;
+    }
+
+    public void setShoppingNotes(String shoppingNotes) {
+        this.shoppingNotes = shoppingNotes;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(String addTime) {
+        this.addTime = addTime;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+}

src/main/java/com/caimei/modules/shiro/service/ShiroService.java

@@ -10,4 +10,8 @@ public interface ShiroService {
     String createToken(CmMallAdminUser user) throws Exception;
 
     CmMallAdminUser findByUserId(Integer id);
+
+    void changePassword(CmMallAdminUser user);
+
+    CmMallAdminUser findOrganize(Integer id);
 }

src/main/java/com/caimei/modules/shiro/service/impl/ShiroServiceImpl.java

@@ -36,4 +36,14 @@ public class ShiroServiceImpl implements ShiroService {
     public CmMallAdminUser findByUserId(Integer id) {
         return userDao.findByUserId(id);
     }
+
+    @Override
+    public void changePassword(CmMallAdminUser user) {
+        userDao.changePassword(user);
+    }
+
+    @Override
+    public CmMallAdminUser findOrganize(Integer id) {
+        return userDao.findOrganize(id);
+    }
 }

src/main/java/com/caimei/utils/MD5Util.java

@@ -1,82 +1,57 @@
-/**  
- * Project Name:caiMeiCRM  
- * File Name:MD5Util.java  
- * Package Name:com.caimei.base.utils  
- * Date:2015-1-15下午1:27:25  
- * Copyright (c) 2015, 1722948843@qq.com.com All Rights Reserved.  
- *  
-*/  
-  
-package com.caimei.utils;  
+package com.caimei.utils;
 
 import java.security.MessageDigest;
+import java.util.UUID;
 
-/**  
- * ClassName:MD5Util <br/>  
- * Function: TODO ADD FUNCTION. <br/>  
- * Reason:   TODO ADD REASON. <br/>  
- * Date:     2015-1-15 下午1:27:25 <br/>  
- * @author   822  
- * @version    
- * @since    JDK 1.6  
- * @see        
+/**
+ * @author : Charles
+ * @description : Description
+ * @date : 2020/1/3
  */
 public class MD5Util {
-
-	/* ***************************************************
-	 	TODO 2018-5-9 此工具类已经整合至com.caimei.utils.MD5Utils
+    /**
+	 * md5加密
+	 * @param s：待加密字符串
+	 * @return 加密后16进制字符串
 	 */
-	public static String MD5(String s) throws Exception {
-		if (s.trim() == null) {
-			return "null";
-		}
-		MessageDigest messagedigest = MessageDigest.getInstance("MD5");
-		byte[] abyte0 = s.getBytes("utf-8");
-		byte[] abyte1 = messagedigest.digest(abyte0);
-		return bytes2Hex(abyte1).toUpperCase();
-	}
-
-	private static String bytes2Hex(byte[] b) {
-		String s = "";
-		for (int i = 0; i < b.length; ++i) {
-			String s1 = Integer.toHexString(b[i] & 0xFF);
-			if (s1.length() == 1) {
-				s = s + "0";
-			}
-			s = s + s1;
-		}
-
-		return s;
+	public static String md5(String s) {
+	    try {
+	    	//实例化MessageDigest的MD5算法对象
+	        MessageDigest md = MessageDigest.getInstance("MD5");
+	        //通过digest方法返回哈希计算后的字节数组
+	        byte[] bytes = md.digest(s.getBytes("utf-8"));
+	        //将字节数组转换为16进制字符串并返回
+	        return toHex(bytes);
+	    }
+	    catch (Exception e) {
+	        throw new RuntimeException(e);
+	    }
 	}
-	
 	/**
-	 * <p>Description: 16位的MD5值</p>
-	 * <p>Company: caimei365</p> 
-	 * @author dmeng
-	 * @date 2015年12月17日 下午5:28:49
-	 * @param s
+	 * 获取随即盐
 	 * @return
-	 * @throws Exception
 	 */
-	public static String MD5To16Bit(String s) throws Exception {
-		MessageDigest md = MessageDigest.getInstance("MD5");
-		md.update(s.getBytes());
-		byte b[] = md.digest();
-		int i;
-		StringBuffer buf = new StringBuffer("");
-		for (int offset = 0; offset < b.length; offset++) {
-			i = b[offset];
-			if (i < 0)
-				i += 256;
-			if (i < 16)
-				buf.append("0");
-			buf.append(Integer.toHexString(i));
-		}
-		return buf.toString().substring(8, 24);
+	public static String salt(){
+		//利用UUID生成随机盐
+		UUID uuid = UUID.randomUUID();
+		//返回a2c64597-232f-4782-ab2d-9dfeb9d76932
+		String[] arr = uuid.toString().split("-");
+		return arr[0];
 	}
-	
-	public static void main(String[] args) throws Exception{
-		System.out.println(MD5Util.MD5To16Bit("act_name=发红包测试&client_ip=127.0.0.1&max_value=132&mch_billno=100257913453645825&mch_id=10025791&min_value=132&nick_name=采美365网&nonce_str=A1ED1E437160452FAE18356985D38F43&re_openid=oVTYvt4xhmqGKSI3owBO1TdJqtYo&remark=快来抢！&send_name=采美365网&total_amount=132&total_num=1&wishing=恭喜发财,大吉大利&wxappid=wxea43a0f9ebce9e66&key=CaimeiWxpayasdklfj8sdf27sdf3DcVd"));
-		
+	/**
+	 * 字节数组转换为16进制字符串
+	 * @param bytes数组
+	 * @return 16进制字符串
+	 */
+	private static String toHex(byte[] bytes) {
+	    final char[] HEX_DIGITS = "0123456789ABCDEF".toCharArray();
+	    StringBuilder ret = new StringBuilder(bytes.length * 2);
+	    for (int i=0; i<bytes.length; i++) {
+	        ret.append(HEX_DIGITS[(bytes[i] >> 4) & 0x0f]);
+	        ret.append(HEX_DIGITS[bytes[i] & 0x0f]);
+	    }
+	    return ret.toString();
 	}
+
 }
+

src/main/resources/mapper/UserMapper.xml

@@ -23,4 +23,25 @@
           id = #{id}
           AND delFlag = '0'
     </select>
+
+    <update id="changePassword" parameterType="com.caimei.modules.shiro.entity.CmMallAdminUser">
+        UPDATE
+          cm_mall_admin_user
+        SET
+          password = #{password},
+          salt = #{salt},
+          updateTime = #{updateTime}
+        WHERE
+          id = #{id}
+    </update>
+
+    <select id="findOrganize" resultType="com.caimei.modules.shiro.entity.CmMallAdminUser">
+        SELECT
+          *
+        FROM
+          cm_mall_organize
+        WHERE
+          id = #{id}
+          AND delFlag = '0'
+    </select>
 </mapper>