联合丽格改版

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

@@ -10,13 +10,11 @@ import com.caimei.utils.RandomCodeGenerator;
 import com.caimei.utils.SMSUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.util.StringUtil;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.thymeleaf.util.StringUtils;
 
 import java.util.Date;
@@ -29,19 +27,19 @@ import java.util.Random;
  * @author lijun
  * @version 2019-11-22
  */
-@Controller
+@RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/user/cmOperationUser")
 public class CmOperationUserController {
-    @Autowired
-    private CmOperationUserService cmOperationUserService;
-    @Autowired
-    private NewCmClubService newCmClubService;
+
+    private final CmOperationUserService cmOperationUserService;
+    private final NewCmClubService newCmClubService;
 
     /**
      * 查看运营人员
      */
     @ResponseBody
-    @RequestMapping("/list")
+    @GetMapping("/list")
     public JsonModel list(CmOperationUser cmOperationUser, Page page) {
         PageHelper.startPage(page.getIndex(), page.getPageSize());
         List<CmOperationUser> operationUserList = cmOperationUserService.findList(cmOperationUser);
@@ -55,8 +53,7 @@ public class CmOperationUserController {
      * @param cmOperationUser
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "save", method = RequestMethod.POST)
+    @PostMapping(value = "save")
     public JsonModel save(@RequestBody CmOperationUser cmOperationUser) {
         JsonModel jsonModel = JsonModel.newInstance();
         //判断该运营人手机号是否已存在
@@ -120,8 +117,7 @@ public class CmOperationUserController {
      * @param cmOperationUser
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "updateInvitationCode")
+    @GetMapping(value = "updateInvitationCode")
     public JsonModel updateInvitationCode(CmOperationUser cmOperationUser) {
         if (!StringUtils.equals("2", cmOperationUser.getStatus())) {//如果已绑定则不更新
             //生成随机码6位
@@ -151,8 +147,7 @@ public class CmOperationUserController {
      * @param cmOperationUser
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "untiedOperationUser")
+    @GetMapping(value = "untiedOperationUser")
     public JsonModel untiedOperationUser(CmOperationUser cmOperationUser) {
         cmOperationUser.setOpenid("");
         cmOperationUser.setNickName("");

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

@@ -1,18 +1,24 @@
 package com.caimei.modules.club.controller;
 
+import com.caimei.modules.club.dao.NewCmClubDao;
 import com.caimei.modules.club.entity.*;
 import com.caimei.modules.club.service.CmUserOrganizeService;
 import com.caimei.modules.club.service.CmUserService;
 import com.caimei.modules.club.service.NewCmClubService;
 import com.caimei.utils.*;
 import com.github.pagehelper.PageHelper;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
+import org.junit.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -20,22 +26,26 @@ import java.util.List;
 /**
  * 会所管理
  */
-@Controller
+@RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/user/cmUserOrganize")
 public class CmUserOrganizeController {
-    @Autowired
-    private CmUserOrganizeService cmUserOrganizeService;
-    @Autowired
-    private CmUserService cmUserService;
-    @Autowired
-    private NewCmClubService newCmClubService;
+
+    private final CmUserOrganizeService cmUserOrganizeService;
+    private final CmUserService cmUserService;
+    private final NewCmClubService newCmClubService;
+
+    @GetMapping(value = "/clubDetail")
+    public JsonModel userDetail(Integer clubId) {
+        return JsonModel.newInstance().success(newCmClubService.findClubById(clubId));
+    }
 
     /**
-     * 会所列表
+     * 机构列表
      */
-    @ResponseBody
-    @RequestMapping(value = "/clubList")
+    @GetMapping(value = "/clubList")
     public JsonModel toCmOrganizeClubList(CmUser cmUser, Page page) {
+        Assert.assertNotNull(cmUser.getUserOrganizeID());
         PageHelper.startPage(page.getIndex(), page.getPageSize());
         List<CmUser> cmUserList = cmUserService.findListBuyUserInfo(cmUser);
         Page<CmUser> cmUserPage = new Page<>(cmUserList);
@@ -47,8 +57,7 @@ public class CmUserOrganizeController {
      *
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "/toAddClubUser")
+    @GetMapping(value = "/toAddClubUser")
     public JsonModel toAddClubUser(NewCmClub newCmClub) {
         if (null != newCmClub.getClubID()) {
             newCmClub = newCmClubService.findClubById(newCmClub.getClubID());
@@ -78,8 +87,7 @@ public class CmUserOrganizeController {
      * @param cmUserOrganize
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "saveAddClubUser")
+    @GetMapping(value = "saveAddClubUser")
     public JsonModel saveAddClubUser(CmUserOrganize cmUserOrganize, NewCmClub newCmClub, CmUser cmUser) throws Exception {
         JsonModel jsonModel = JsonModel.newInstance();
         String contractMobile = newCmClub.getContractMobile();
@@ -114,19 +122,11 @@ public class CmUserOrganizeController {
             newCmClub.setScanFlag("2");
             newCmClub.setFlag("0");
             newCmClub.setAddTime(currentDate);
-            newCmClub.setLinkMan1(newCmClub.getLinkMan());
-            newCmClub.setContractMobile1(newCmClub.getContractMobile());
-            newCmClub.setPayFlag1(AppKeys.FLAG_NO);
-            newCmClub.setLevel(0d);
-            newCmClub.setSubClubCount(0);
-            newCmClub.setFavoriteTimes(0);
             newCmClub.setDefaultServiceProviderUpdTime(DateTimeUtil.getCurrentDateTime());
             newCmClubService.insert(newCmClub);
 
             //更新用户绑定关系
             cmUser.setClubID(String.valueOf(newCmClub.getClubID()));
-            String nick = cmUser.getUserID() + "_" + RandomCodeGenerator.generateCodeString(4).toLowerCase();
-            cmUser.setNick(nick);
             cmUser.setCompanyUserID(cmUser.getUserID());
 
             //更新会所绑定关系
@@ -156,18 +156,11 @@ public class CmUserOrganizeController {
         cmUser.setPassword(MD5Util.md5("caimei123"));
         cmUser.setBindMobile(newCmClub.getContractMobile());
         cmUser.setUserName(newCmClub.getName());
-        cmUser.setEmailCheckFlag("0");
-        cmUser.setMobileCheckFlag("0");
         cmUser.setUserMoney(0d);
         cmUser.setAbleUserMoney(0d);
-        cmUser.setPoint("0");
-        cmUser.setShopERPFlag("0");
         cmUser.setUserBeans("0");
         cmUser.setValidFlag("1");
         cmUser.setAgreeFlag("1");
-        cmUser.setLoginFailTime("0");
-        cmUser.setUserLevelID("1");
-        cmUser.setScanFlag("2");
         cmUser.setUserPermission(2);
         return cmUser;
     }
@@ -178,10 +171,9 @@ public class CmUserOrganizeController {
      * @param cmUser
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "switchLine")
+    @GetMapping(value = "switchLine")
     public JsonModel switchLine(CmUser cmUser) {
-        if (cmUser.getClubStatus().equals("91")) {
+        if ("91".equals(cmUser.getClubStatus())) {
             cmUser.setClubStatus("90");
         } else {
             cmUser.setClubStatus("91");
@@ -190,7 +182,7 @@ public class CmUserOrganizeController {
         NewCmClub newCmClub = new NewCmClub();
         newCmClub.setClubID(Integer.parseInt(cmUser.getClubID()));
         newCmClub.setUserID(cmUser.getUserID());
-        newCmClub.setStatus(90);
+        newCmClub.setStatus(Integer.valueOf(cmUser.getClubStatus()));
         newCmClubService.update(newCmClub);//更新会所表数据
         return JsonModel.newInstance().success();
     }
@@ -198,8 +190,7 @@ public class CmUserOrganizeController {
     /**
      * 省
      */
-    @ResponseBody
-    @RequestMapping("/province")
+    @GetMapping("/province")
     public JsonModel getProvince() {
         List<Province> provinceList = cmUserOrganizeService.getProvince();
         return JsonModel.newInstance().success(provinceList);
@@ -208,8 +199,7 @@ public class CmUserOrganizeController {
     /**
      * 市
      */
-    @ResponseBody
-    @RequestMapping("/city")
+    @GetMapping("/city")
     public JsonModel getCity(Long provinceid) {
         List<City> cityList = cmUserOrganizeService.getCity(provinceid);
         return JsonModel.newInstance().success(cityList);
@@ -218,8 +208,7 @@ public class CmUserOrganizeController {
     /**
      * 区
      */
-    @ResponseBody
-    @RequestMapping("/town")
+    @GetMapping("/town")
     public JsonModel getTown(Integer cityid) {
         List<Town> townList = cmUserOrganizeService.getTown(cityid);
         return JsonModel.newInstance().success(townList);

src/main/java/com/caimei/modules/club/dao/CmUserDao.java

@@ -15,4 +15,6 @@ public interface CmUserDao {
     void insert(CmUser cmUser);
 
     void update(CmUser cmUser);
+
+    CmUser findUserById(Integer userId);
 }

src/main/java/com/caimei/modules/club/dao/NewCmClubDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 @Mapper
 public interface NewCmClubDao {
 
-    List<NewCmClub> findClubById(Integer clubID);
+    NewCmClub findClubById(Integer clubID);
 
     void insert(NewCmClub newCmClub);
 

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

@@ -14,6 +14,8 @@ import java.io.Serializable;
 public class CmUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
+    private String startTime;
+    private String endTime;
     private Integer userID;        // userID
     private Integer userOrganizeID;//用户组织ID
     private String mobile;        // 手机号码
@@ -26,36 +28,28 @@ public class CmUser implements Serializable {
     private String registerUserTypeID;        // 用户类型，见表c_usertype或枚举UserType
     private String manufacturerStatus;        // 供应商状态，见表c_shopstatus或枚举ShopStatus
     private String shopID;        // 供应商Id
-    private String serviceProviderFlag;        // 已废弃  是否创客，1是 空或0否
     private String auditStatus;        // auditStatus
     private String auditTime;        // auditTime
     private String auditNote;        // auditNote
     private String registerTime;        // 注册时间
-    private String registerIP;        // 注册ip
     private String loginTime;        // 登录时间
-    private String loginFailTime;        // 登录失败次数
-    private String loginIP;        // 登录ip
     private String validFlag;        // 用户状态，1正常，0冻结
-    private String clubStatus;        // 会所状态，见表c_clubstatus或枚举ClubStatus
+    private String clubStatus;        // 会所状态，1待审核 90已上线 91已下线 92审核未通过
     private String clubID;        // 会所Id
     private String agreeFlag;        // agreeFlag
     private String serviceProviderStatus;        // 创客状态
     private String serviceProviderID;        // 创客Id
     private Double userMoney;        // 账户余额
     private Double ableUserMoney;        //账户可用余额
-    private String logoffTime;        // logoffTime
-    private String appKey;        // appKey
-    private String appSecret;        // appSecret
-    private String scanFlag;        // 扫描标志(4 CRM拉上来的会所)
     private String userBeans;        // 采美豆数量
-    private String guideFlag;        // 引导层弹出  0需要弹出  1不需要弹出
     private String account;//账号名： 企业账号登录使用
     private Integer userIdentity;//用户身份
     private String realName;//真实姓名
     private Integer companyUserID;//企业用户id
     private String bindMobile;//企业绑定手机号
-    private String tipStatus;//弹窗提示状态
     private String linkMan;//联系人
+    private String businessLicenseImage;//营业执照
+    private String socialCreditCode; //营业执照号
 
     //会所用户信息
     private String town; // 区

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

@@ -53,7 +53,7 @@ public class NewCmClub implements Serializable {
     private Integer firstClubType; // 一级分类为医美=1和生美=2
     private String secondClubType; // 医美的二级分类为诊所=1、门诊=2、医院=3。  生美没有二级分类
     private String department; // 若为医美分类下的门诊和医院则需要填写科室。
-    private String medicalPracticeLicenseImg; // 医美分类必须上传医疗执业许可证
+    private String medicalPracticeLicenseImg; // 医疗执业许可证
     private String socialCreditCode;//统一社会编码
 
     /**

src/main/java/com/caimei/modules/club/service/CmUserService.java

@@ -1,10 +1,12 @@
 package com.caimei.modules.club.service;
 
 import com.caimei.modules.club.entity.CmUser;
+import com.caimei.modules.club.entity.NewCmClub;
 
 import java.util.List;
 
 public interface CmUserService {
+
     List<CmUser> findListBuyUserInfo(CmUser cmUser);
 
     List<CmUser> findListBuyBindMobile(CmUser cmUser);

src/main/java/com/caimei/modules/club/service/impl/CmUserServiceImpl.java

@@ -3,15 +3,18 @@ package com.caimei.modules.club.service.impl;
 import com.caimei.modules.club.dao.CmUserDao;
 import com.caimei.modules.club.entity.CmUser;
 import com.caimei.modules.club.service.CmUserService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service
 public class CmUserServiceImpl implements CmUserService {
-    @Autowired
-    private CmUserDao cmUserDao;
+
+    private final CmUserDao cmUserDao;
+
+    public CmUserServiceImpl(CmUserDao cmUserDao) {
+        this.cmUserDao = cmUserDao;
+    }
 
     @Override
     public List<CmUser> findListBuyUserInfo(CmUser cmUser) {

src/main/java/com/caimei/modules/club/service/impl/NewCmClubServiceImpl.java

@@ -16,12 +16,7 @@ public class NewCmClubServiceImpl implements NewCmClubService {
 
     @Override
     public NewCmClub findClubById(Integer clubID) {
-        List<NewCmClub> newCmClubs = newCmClubDao.findClubById(clubID);
-        if (CollectionUtils.isNotEmpty(newCmClubs) && newCmClubs.size() > 0) {
-            return newCmClubs.get(0);
-        } else {
-            return null;
-        }
+        return newCmClubDao.findClubById(clubID);
     }
 
     @Override

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

@@ -4,25 +4,24 @@ package com.caimei.modules.order.controller;
 import com.caimei.modules.order.entity.CmOrderRemark;
 import com.caimei.modules.order.service.CmOrderRemarkService;
 import com.caimei.utils.JsonModel;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-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 org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 /**
  * 订单备注Controller
  */
-@Controller
+@RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/order/cmOrderRemark")
 public class CmOrderRemarkController {
 
-    @Autowired
-    private CmOrderRemarkService cmOrderRemarkService;
+
+    private final CmOrderRemarkService cmOrderRemarkService;
 
     @ModelAttribute
     public CmOrderRemark get(@RequestParam(required = false) String id) {
@@ -36,9 +35,10 @@ public class CmOrderRemarkController {
         return entity;
     }
 
-    //订单备注
-    @ResponseBody
-    @RequestMapping(value = "remarksView")
+    /**
+     * 订单备注
+     */
+    @GetMapping(value = "remarksView")
     public JsonModel remarksView(Integer orderID) {
         //通过商品ID获取对应备注信息
         CmOrderRemark remark = new CmOrderRemark();

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

@@ -9,11 +9,14 @@ import com.caimei.modules.order.service.CmReturnedPurchaseService;
 import com.caimei.modules.order.service.NewOrderService;
 import com.caimei.utils.JsonModel;
 import com.github.pagehelper.PageHelper;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -24,15 +27,16 @@ import java.util.Map;
 /**
  * 退货退款Controller
  */
-@Controller
+@RequiredArgsConstructor
+@RestController
 @RequestMapping(value = "/order/cmReturnedPurchase")
 public class CmReturnedPurchaseController {
-    @Autowired
-    private CmReturnedPurchaseService cmReturnedPurchaseService;
-    @Autowired
-    private NewOrderService newOrderService;
-    @Autowired
-    private BpClauseService bpClauseService;
+
+    private final CmReturnedPurchaseService cmReturnedPurchaseService;
+
+    private final NewOrderService newOrderService;
+
+    private final BpClauseService bpClauseService;
 
 
     /**
@@ -42,8 +46,7 @@ public class CmReturnedPurchaseController {
      * @param page
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "list")
+    @GetMapping(value = "list")
     public JsonModel list(CmReturnedPurchase cmReturnedPurchase, Page page) {
         PageHelper.startPage(page.getIndex(), page.getPageSize());
         List<CmReturnedPurchase> returnedPurchaseList = cmReturnedPurchaseService.findList(cmReturnedPurchase);
@@ -54,8 +57,7 @@ public class CmReturnedPurchaseController {
     /**
      * 退款详情
      */
-    @ResponseBody
-    @RequestMapping(value = "toRecturnRecord")
+    @GetMapping(value = "toRecturnRecord")
     public JsonModel toRecturnRecord(CmReturnedPurchase cmReturnedPurchase) {
         Map<String, Object> map = new HashMap();
         try {

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

@@ -4,14 +4,13 @@ import com.caimei.modules.club.entity.Page;
 import com.caimei.modules.order.entity.*;
 import com.caimei.modules.order.service.*;
 import com.caimei.utils.JsonModel;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.junit.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-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 org.springframework.web.bind.annotation.*;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -19,23 +18,24 @@ import java.util.*;
 /**
  * 组织订单
  */
-@Controller
+@RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/order/organize")
 public class OrganizeOrderController {
-    @Autowired
-    private NewOrderService newOrderService;
-    @Autowired
-    private BpClauseService bpClauseService;
-    @Autowired
-    private CmReturnedPurchaseService cmReturnedPurchaseService;
-    @Autowired
-    private CmReceiptOrderRelationService cmReceiptOrderRelationService;
-    @Autowired
-    private NewOrderConfigService newOrderConfigService;
-    @Autowired
-    private CmDiscernReceiptService cmDiscernReceiptService;
-    @Autowired
-    private NewShopOrderService newShopOrderService;
+
+    private final NewOrderService newOrderService;
+
+    private final BpClauseService bpClauseService;
+
+    private final CmReturnedPurchaseService cmReturnedPurchaseService;
+
+    private final CmReceiptOrderRelationService cmReceiptOrderRelationService;
+
+    private final NewOrderConfigService newOrderConfigService;
+
+    private final CmDiscernReceiptService cmDiscernReceiptService;
+
+    private final NewShopOrderService newShopOrderService;
 
     @ModelAttribute
     public NewOrder getOrder(@RequestParam(required = false) String id) {
@@ -51,22 +51,17 @@ public class OrganizeOrderController {
 
     /**
      * 订单列表
+     * 查询参数 ：订单Id,订单编号,下单时间/终止时间,买家,收货人,订单状态,收款状态,发货状态,退款状态,待审核退款
      */
-    @ResponseBody
-    @RequestMapping("orderList")
+    @GetMapping("orderList")
     public JsonModel orderList(NewOrder order, Page page) {
+        Assert.assertNotNull("组织id不能为空！", order.getOrganizeID());
         if (null != order.getStartTime() && !"".equals(order.getStartTime()) && !order.getStartTime().endsWith("00:00:00")) {
             order.setStartTime(order.getStartTime() + " 00:00:00");
         }
         if (null != order.getEndTime() && !"".equals(order.getEndTime()) && !order.getEndTime().endsWith("23:59:59")) {
             order.setEndTime(order.getEndTime() + " 23:59:59");
         }
-        if (null != order.getStartRefundTime() && !"".equals(order.getStartRefundTime()) && !order.getStartRefundTime().endsWith("00:00:00")) {
-            order.setStartRefundTime(order.getStartRefundTime() + " 00:00:00");
-        }
-        if (null != order.getEndRefundTime() && !"".equals(order.getEndRefundTime()) && !order.getEndRefundTime().endsWith("23:59:59")) {
-            order.setEndRefundTime(order.getEndRefundTime() + " 23:59:59");
-        }
         if (null != order.getBuyer()) {
             order.setBuyer(order.getBuyer().trim());
         }
@@ -81,14 +76,14 @@ public class OrganizeOrderController {
     /**
      * 订单详情
      */
-    @ResponseBody
-    @RequestMapping("detail")
+    @GetMapping("detail")
     public JsonModel detail(NewOrder order) {
         Map<String, Object> map = new HashMap();
         BpClause bpClause = new BpClause();
         bpClause.setEnabledStatus("1");
         List<BpClause> bpClauses = bpClauseService.findList(bpClause);
         map.put("bpClauses", bpClauses);
+
         //获取订单是否可以申请付款
         List<Integer> oId = new ArrayList<>();
         oId.add(order.getOrderID());
@@ -117,22 +112,22 @@ public class OrganizeOrderController {
             order.setSplitFlag("0");
         }
         map.put("order", order);
-        if ("0".equals(order.getStatus())) {
-            try {
-                NewOrderConfig confirmOverTime = newOrderConfigService.getValueByKey("confirmOverTime");
-                Double value = confirmOverTime.getValue(); //待确认超过 value 小时自动取消订单
-                GregorianCalendar gc = new GregorianCalendar();
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                Date orderTime = sdf.parse(order.getOrderTime());
-                gc.setTime(orderTime);
-                gc.add(Calendar.HOUR, value.intValue());
-                Date time = gc.getTime();
-                String ot = sdf.format(time);
-                if (time.after(new Date())) map.put("time", ot);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+//        if ("0".equals(order.getStatus())) {
+//            try {
+//                NewOrderConfig confirmOverTime = newOrderConfigService.getValueByKey("confirmOverTime");
+//                Double value = confirmOverTime.getValue(); //待确认超过 value 小时自动取消订单
+//                GregorianCalendar gc = new GregorianCalendar();
+//                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                Date orderTime = sdf.parse(order.getOrderTime());
+//                gc.setTime(orderTime);
+//                gc.add(Calendar.HOUR, value.intValue());
+//                Date time = gc.getTime();
+//                String ot = sdf.format(time);
+//                if (time.after(new Date())) map.put("time", ot);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
         CmReturnedPurchase cmReturnedPurchase = new CmReturnedPurchase();
         cmReturnedPurchase.setStatus("2");
         cmReturnedPurchase.setOrderID(order.getOrderID());
@@ -162,8 +157,7 @@ public class OrganizeOrderController {
     /**
      * 发货记录
      */
-    @ResponseBody
-    @RequestMapping("logisticsDetails")
+    @GetMapping("logisticsDetails")
     public JsonModel logisticsDetails(Integer orderID, String logisticsBatchID) {
         List<LogisticsInfoVo> logisticsInfoVos = new ArrayList<>();
         logisticsInfoVos = newShopOrderService.logisticsDetails(orderID, logisticsBatchID);
@@ -173,8 +167,7 @@ public class OrganizeOrderController {
     /**
      * 收退款记录
      */
-    @ResponseBody
-    @RequestMapping(value = "toRefundRecord")
+    @GetMapping(value = "toRefundRecord")
     public JsonModel toRefundRecord(CmReturnedPurchase cmReturnedPurchase, String from) {
         JsonModel jsonModel = JsonModel.newInstance();
         Map<String, Object> map = new HashMap();
@@ -203,8 +196,7 @@ public class OrganizeOrderController {
     /**
      * 退款退货记录
      */
-    @ResponseBody
-    @RequestMapping(value = "toRecturnRecordByOrderID")
+    @GetMapping(value = "toRecturnRecordByOrderID")
     public JsonModel toRecturnRecordByOrderID(CmReturnedPurchase cmReturnedPurchase) {
         Map<String, Object> map = new HashMap();
         try {

src/main/java/com/caimei/modules/order/dao/BpClauseDao.java

@@ -7,5 +7,6 @@ import java.util.List;
 
 @Mapper
 public interface BpClauseDao {
+
     List<BpClause> findList(BpClause bpClause);
 }

src/main/java/com/caimei/modules/order/dao/CmReturnedPurchaseDao.java

@@ -8,6 +8,7 @@ import java.util.List;
 
 @Mapper
 public interface CmReturnedPurchaseDao {
+
     List<Integer> findOrderIDInReturnPurchase(@Param("orderIds") List<Integer> oId);
 
     List<Integer> findOrderIDsInApplyReturnFlag(@Param("orderIds") List<Integer> oId);

src/main/java/com/caimei/modules/order/dao/NewOrderConfigDao.java

@@ -6,5 +6,6 @@ import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface NewOrderConfigDao {
+
     NewOrderConfig getValueByKey(@Param("key") String key);
 }

src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -7,6 +7,7 @@ import java.util.List;
 
 @Mapper
 public interface NewOrderDao {
+
     List<NewOrder> findList(NewOrder newOrder);
 
     NewOrder get(String id);

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

@@ -1,5 +1,7 @@
 package com.caimei.modules.order.entity;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -8,6 +10,7 @@ import java.util.List;
  * @date 2018-07-24
  * @description 主订单表
  */
+@Data
 public class NewOrder implements Serializable {
     private Integer orderID;             // bigint(11) not null,
     private String orderNo;             // varchar(30) comment '订单编号',
@@ -98,669 +101,5 @@ public class NewOrder implements Serializable {
     private String[] ps;    //付款状态集合
     private String shopOrderNo;//       varchar(30) comment '子订单编号'
     private String toAudit;   //有没有收款待审核的订单 , 有的1
-
-    public Integer getOrderID() {
-        return orderID;
-    }
-
-    public void setOrderID(Integer orderID) {
-        this.orderID = orderID;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public Integer getUserID() {
-        return userID;
-    }
-
-    public void setUserID(Integer userID) {
-        this.userID = userID;
-    }
-
-    public Integer getOrganizeID() {
-        return organizeID;
-    }
-
-    public void setOrganizeID(Integer organizeID) {
-        this.organizeID = organizeID;
-    }
-
-    public String getShopOrderIDs() {
-        return shopOrderIDs;
-    }
-
-    public void setShopOrderIDs(String shopOrderIDs) {
-        this.shopOrderIDs = shopOrderIDs;
-    }
-
-    public String getOrderSubmitType() {
-        return orderSubmitType;
-    }
-
-    public void setOrderSubmitType(String orderSubmitType) {
-        this.orderSubmitType = orderSubmitType;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Double getProductTotalFee() {
-        return productTotalFee;
-    }
-
-    public void setProductTotalFee(Double productTotalFee) {
-        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;
-    }
-
-    public void setOrderTotalFee(Double orderTotalFee) {
-        this.orderTotalFee = orderTotalFee;
-    }
-
-    public Double getPayableAmount() {
-        return payableAmount;
-    }
-
-    public void setPayableAmount(Double payableAmount) {
-        this.payableAmount = payableAmount;
-    }
-
-    public Double getPayTotalFee() {
-        return payTotalFee;
-    }
-
-    public void setPayTotalFee(Double payTotalFee) {
-        this.payTotalFee = payTotalFee;
-    }
-
-    public Double getBalancePayFee() {
-        return balancePayFee;
-    }
-
-    public void setBalancePayFee(Double balancePayFee) {
-        this.balancePayFee = balancePayFee;
-    }
-
-    public Double getDiscountFee() {
-        return discountFee;
-    }
-
-    public void setDiscountFee(Double discountFee) {
-        this.discountFee = discountFee;
-    }
-
-    public Integer getSpID() {
-        return spID;
-    }
-
-    public void setSpID(Integer spID) {
-        this.spID = spID;
-    }
-
-    public Integer getMainSpID() {
-        return mainSpID;
-    }
-
-    public void setMainSpID(Integer mainSpID) {
-        this.mainSpID = mainSpID;
-    }
-
-    public String getNote() {
-        return note;
-    }
-
-    public void setNote(String note) {
-        this.note = note;
-    }
-
-    public Integer getClubID() {
-        return clubID;
-    }
-
-    public void setClubID(Integer clubID) {
-        this.clubID = clubID;
-    }
-
-    public String getClubScanTime() {
-        return clubScanTime;
-    }
-
-    public void setClubScanTime(String clubScanTime) {
-        this.clubScanTime = clubScanTime;
-    }
-
-    public String getPayWay() {
-        return payWay;
-    }
-
-    public void setPayWay(String payWay) {
-        this.payWay = payWay;
-    }
-
-    public Integer getPayTypeID() {
-        return payTypeID;
-    }
-
-    public void setPayTypeID(Integer payTypeID) {
-        this.payTypeID = payTypeID;
-    }
-
-    public String getOrderSource() {
-        return orderSource;
-    }
-
-    public void setOrderSource(String orderSource) {
-        this.orderSource = orderSource;
-    }
-
-    public String getOrderTime() {
-        return orderTime;
-    }
-
-    public void setOrderTime(String orderTime) {
-        this.orderTime = orderTime;
-    }
-
-    public String getConfirmTime() {
-        return confirmTime;
-    }
-
-    public void setConfirmTime(String confirmTime) {
-        this.confirmTime = confirmTime;
-    }
-
-    public String getCooFreeFlag() {
-        return cooFreeFlag;
-    }
-
-    public void setCooFreeFlag(String cooFreeFlag) {
-        this.cooFreeFlag = cooFreeFlag;
-    }
-
-    public Integer getCooFreeRate() {
-        return cooFreeRate;
-    }
-
-    public void setCooFreeRate(Integer cooFreeRate) {
-        this.cooFreeRate = cooFreeRate;
-    }
-
-    public Double getCooFreeAmount() {
-        return cooFreeAmount;
-    }
-
-    public void setCooFreeAmount(Double cooFreeAmount) {
-        this.cooFreeAmount = cooFreeAmount;
-    }
-
-    public String getConfirmFlag() {
-        return confirmFlag;
-    }
-
-    public void setConfirmFlag(String confirmFlag) {
-        this.confirmFlag = confirmFlag;
-    }
-
-    public Integer getClauseID() {
-        return clauseID;
-    }
-
-    public void setClauseID(Integer clauseID) {
-        this.clauseID = clauseID;
-    }
-
-    public String getClauseContent() {
-        return clauseContent;
-    }
-
-    public void setClauseContent(String clauseContent) {
-        this.clauseContent = clauseContent;
-    }
-
-    public String getClauseName() {
-        return clauseName;
-    }
-
-    public void setClauseName(String clauseName) {
-        this.clauseName = clauseName;
-    }
-
-    public String getFreePostFlag() {
-        return freePostFlag;
-    }
-
-    public void setFreePostFlag(String freePostFlag) {
-        this.freePostFlag = freePostFlag;
-    }
-
-    public Double getFreight() {
-        return freight;
-    }
-
-    public void setFreight(Double freight) {
-        this.freight = freight;
-    }
-
-    public Integer getBuyUserID() {
-        return buyUserID;
-    }
-
-    public void setBuyUserID(Integer buyUserID) {
-        this.buyUserID = buyUserID;
-    }
-
-    public String getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(String orderType) {
-        this.orderType = orderType;
-    }
-
-    public List<NewShopOrder> getNewShopOrders() {
-        return newShopOrders;
-    }
-
-    public void setNewShopOrders(List<NewShopOrder> newShopOrders) {
-        this.newShopOrders = newShopOrders;
-    }
-
-    public OrderUserInfo getBpOrderUserinfo() {
-        return bpOrderUserinfo;
-    }
-
-    public void setBpOrderUserinfo(OrderUserInfo bpOrderUserinfo) {
-        this.bpOrderUserinfo = bpOrderUserinfo;
-    }
-
-    public OrderInvoice getOrderInvoice() {
-        return orderInvoice;
-    }
-
-    public void setOrderInvoice(OrderInvoice orderInvoice) {
-        this.orderInvoice = orderInvoice;
-    }
-
-    public Integer getProductCount() {
-        return productCount;
-    }
-
-    public void setProductCount(Integer productCount) {
-        this.productCount = productCount;
-    }
-
-    public Integer getPresentCount() {
-        return presentCount;
-    }
-
-    public void setPresentCount(Integer presentCount) {
-        this.presentCount = presentCount;
-    }
-
-    public String getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(String payTime) {
-        this.payTime = payTime;
-    }
-
-    public String getPayFlag() {
-        return payFlag;
-    }
-
-    public void setPayFlag(String payFlag) {
-        this.payFlag = payFlag;
-    }
-
-    public String getOnlinePayFlag() {
-        return onlinePayFlag;
-    }
-
-    public void setOnlinePayFlag(String onlinePayFlag) {
-        this.onlinePayFlag = onlinePayFlag;
-    }
-
-    public Double getPreferential() {
-        return preferential;
-    }
-
-    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;
-    }
-
-    public String getShopName() {
-        return shopName;
-    }
-
-    public void setShopName(String shopName) {
-        this.shopName = shopName;
-    }
-
-    public String getReceiver() {
-        return receiver;
-    }
-
-    public void setReceiver(String receiver) {
-        this.receiver = receiver;
-    }
-
-    public String getBuyer() {
-        return buyer;
-    }
-
-    public void setBuyer(String buyer) {
-        this.buyer = buyer;
-    }
-
-    public String getAlreadyReceipt() {
-        return alreadyReceipt;
-    }
-
-    public void setAlreadyReceipt(String alreadyReceipt) {
-        this.alreadyReceipt = alreadyReceipt;
-    }
-
-    public String getUnReceipt() {
-        return unReceipt;
-    }
-
-    public void setUnReceipt(String unReceipt) {
-        this.unReceipt = unReceipt;
-    }
-
-    public String getPaid() {
-        return paid;
-    }
-
-    public void setPaid(String paid) {
-        this.paid = paid;
-    }
-
-    public String getUnpaid() {
-        return unpaid;
-    }
-
-    public void setUnpaid(String unpaid) {
-        this.unpaid = unpaid;
-    }
-
-    public String getBrokerage() {
-        return brokerage;
-    }
-
-    public void setBrokerage(String brokerage) {
-        this.brokerage = brokerage;
-    }
-
-    public String getBuyerName() {
-        return buyerName;
-    }
-
-    public void setBuyerName(String buyerName) {
-        this.buyerName = buyerName;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getStartRefundTime() {
-        return startRefundTime;
-    }
-
-    public void setStartRefundTime(String startRefundTime) {
-        this.startRefundTime = startRefundTime;
-    }
-
-    public String getEndRefundTime() {
-        return endRefundTime;
-    }
-
-    public void setEndRefundTime(String endRefundTime) {
-        this.endRefundTime = endRefundTime;
-    }
-
-    public Double getTotalAddedValueTax() {
-        return totalAddedValueTax;
-    }
-
-    public void setTotalAddedValueTax(Double totalAddedValueTax) {
-        this.totalAddedValueTax = totalAddedValueTax;
-    }
-
-    public String getShopNameInfo() {
-        return shopNameInfo;
-    }
-
-    public void setShopNameInfo(String shopNameInfo) {
-        this.shopNameInfo = shopNameInfo;
-    }
-
-    public String getOrderRefundType() {
-        return orderRefundType;
-    }
-
-    public void setOrderRefundType(String orderRefundType) {
-        this.orderRefundType = orderRefundType;
-    }
-
-    public String getReturnedPurchaseStatus() {
-        return returnedPurchaseStatus;
-    }
-
-    public void setReturnedPurchaseStatus(String returnedPurchaseStatus) {
-        this.returnedPurchaseStatus = returnedPurchaseStatus;
-    }
-
-    public String getApplyReturnedPurchaseFlag() {
-        return applyReturnedPurchaseFlag;
-    }
-
-    public void setApplyReturnedPurchaseFlag(String applyReturnedPurchaseFlag) {
-        this.applyReturnedPurchaseFlag = applyReturnedPurchaseFlag;
-    }
-
-    public String getSpName() {
-        return spName;
-    }
-
-    public void setSpName(String spName) {
-        this.spName = spName;
-    }
-
-    public List<NewOrderProduct> getOrderProduct() {
-        return orderProduct;
-    }
-
-    public void setOrderProduct(List<NewOrderProduct> orderProduct) {
-        this.orderProduct = orderProduct;
-    }
-
-    public String getSearchflag() {
-        return searchflag;
-    }
-
-    public void setSearchflag(String searchflag) {
-        this.searchflag = searchflag;
-    }
-
-    public String[] getShopNote() {
-        return shopNote;
-    }
-
-    public void setShopNote(String[] shopNote) {
-        this.shopNote = shopNote;
-    }
-
-    public String getRebateOrder() {
-        return rebateOrder;
-    }
-
-    public void setRebateOrder(String rebateOrder) {
-        this.rebateOrder = rebateOrder;
-    }
-
-    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 String getToAudit() {
-        return toAudit;
-    }
-
-    public void setToAudit(String toAudit) {
-        this.toAudit = toAudit;
-    }
 }
 

src/main/java/com/caimei/modules/order/service/BpClauseService.java

@@ -5,5 +5,6 @@ import com.caimei.modules.order.entity.BpClause;
 import java.util.List;
 
 public interface BpClauseService {
+
     List<BpClause> findList(BpClause bpClause);
 }

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -5,6 +5,7 @@ import com.caimei.modules.order.entity.CmReturnedPurchase;
 import java.util.List;
 
 public interface CmReturnedPurchaseService {
+
     List<Integer> findOrderIDsInApplyReturnFlag(List<Integer> oId);
 
     List<CmReturnedPurchase> getReturnedPurchaseList(CmReturnedPurchase cmReturnedPurchase);

src/main/java/com/caimei/modules/order/service/NewOrderConfigService.java

@@ -3,5 +3,6 @@ package com.caimei.modules.order.service;
 import com.caimei.modules.order.entity.NewOrderConfig;
 
 public interface NewOrderConfigService {
+
     NewOrderConfig getValueByKey(String confirmOverTime);
 }

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -4,6 +4,7 @@ import com.caimei.modules.club.entity.Page;
 import com.caimei.modules.order.entity.NewOrder;
 
 public interface NewOrderService {
+
     Page<NewOrder> findList(NewOrder newOrder, Page page);
 
     NewOrder get(String id);

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

@@ -125,10 +125,11 @@ public class NewOrderServiceImpl implements NewOrderService {
         List<Integer> l = new ArrayList<>();
         l.add(newOrder.getOrderID());
         List<Integer> orderIds = cmDiscernReceiptDao.findRebateOrderID(l);
-        if (orderIds.contains(newOrder.getOrderID()))
+        if (orderIds.contains(newOrder.getOrderID())) {
             newOrder.setRebateOrder("1");
-        else
+        } else {
             newOrder.setRebateOrder("0");
+        }
         if (null != newOrder) {
             //获取订单客户
             OrderUserInfo orderUserInfo = orderUserInfoService.findByOrderID(newOrder.getOrderID());
@@ -143,8 +144,10 @@ public class NewOrderServiceImpl implements NewOrderService {
                     List<NewOrderProduct> pList = newOrderProductDao.findListByShopOrderID(shopOrder.getShopOrderID());
                     list.addAll(pList);
                     shopOrder.setNewOrderProducts(pList);
-                    if (pList.stream().anyMatch(p -> p.getProductID().intValue() == 999)) shopOrder.setPostFeeCos("1");
-                    pList.stream().forEach(item -> {
+                    if (pList.stream().anyMatch(p -> p.getProductID() == 999)) {
+                        shopOrder.setPostFeeCos("1");
+                    }
+                    pList.forEach(item -> {
                         if (NewOrderStatus.hasReturn(newOrder.getStatus())) {
                             Integer returningNum = newOrderProductDao.getReturningNum(item.getOrderProductID());
                             Integer returnedNum = newOrderProductDao.getReturnedNum(item.getOrderProductID());
@@ -168,17 +171,21 @@ public class NewOrderServiceImpl implements NewOrderService {
                 double freight = 0D;
                 double totalAddedValueTax = 0D;
                 for (NewOrderProduct op : list) {
-                    if (op.getProductID().intValue() == 999) { //邮费商品
+                    if (op.getProductID() == 999) { //邮费商品
                         freight += op.getPrice();
                     }
                     totalAddedValueTax += op.getTotalAddedValueTax();
                 }
-                if ("1".equals(newOrder.getFreePostFlag())) newOrder.setFreight(freight);
+                if ("1".equals(newOrder.getFreePostFlag())) {
+                    newOrder.setFreight(freight);
+                }
                 newOrder.setTotalAddedValueTax(totalAddedValueTax);
             }
             shopOrders.sort((so1, so2) -> {
                 //给子订单排序  邮费排在最后  其余的按shopOrderID  asc
-                if ("1".equals(so1.getPostFeeCos())) return 1;
+                if ("1".equals(so1.getPostFeeCos())) {
+                    return 1;
+                }
                 return so1.getShopOrderID() - so2.getShopOrderID();
             });
             //获取订单发票

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

@@ -13,12 +13,10 @@ import com.caimei.modules.shiro.service.ShiroService;
 import com.caimei.utils.JsonModel;
 import com.caimei.utils.TokenEncryptUtils;
 import com.github.pagehelper.PageHelper;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.thymeleaf.util.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
@@ -33,38 +31,30 @@ import java.util.Map;
  * @author lijun
  * @version 2019-12-04
  */
-@Controller
+@RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/product/cmMallOrganizeProducts")
 public class CmMallOrganizeProductsController {
 
-    @Autowired
-    private CmMallOrganizeProductsService cmMallOrganizeProductsService;
-    @Autowired
-    private CmMallProductsClassifyService cmMallProductsClassifyService;
-    @Autowired
-    private ShiroService shiroService;
+    private final CmMallOrganizeProductsService cmMallOrganizeProductsService;
+    private final CmMallProductsClassifyService cmMallProductsClassifyService;
+    private final ShiroService shiroService;
+
     /**
-     * 去商品列表页面
+     * 商品列表
      *
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "toProductList")
+    @GetMapping(value = "toProductList")
     public JsonModel toProductList(CmMallOrganizeProducts cmMallOrganizeProducts, Page page) {
-        Map<String, Object> map = new HashMap();
         Page<CmMallOrganizeProducts> organizeProductsPage = cmMallOrganizeProductsService.findPage(page, cmMallOrganizeProducts);
-        //商品分类下拉数据
-        List<CmMallProductsClassify> listByEffective = cmMallProductsClassifyService.findListByEffective(cmMallOrganizeProducts.getOrganizeID());
-        map.put("organizeProductsPage", organizeProductsPage);
-        map.put("listByEffective", listByEffective);
-        return JsonModel.newInstance().success(map);
+        return JsonModel.newInstance().success(organizeProductsPage);
     }
 
     /**
      * 商品模块列表
      */
-    @ResponseBody
-    @RequestMapping("/module")
+    @GetMapping("/module")
     public JsonModel findAllModule(Integer organizeID) {
         List<CmMallPageModules> mallPageModulesList = cmMallOrganizeProductsService.findAllModule(organizeID);
         return JsonModel.newInstance().success(mallPageModulesList);
@@ -73,16 +63,9 @@ public class CmMallOrganizeProductsController {
     /**
      * 编辑回显
      */
-    @ResponseBody
-    @RequestMapping(value = "toEditProductInfo")
+    @GetMapping(value = "toEditProductInfo")
     public JsonModel toEditProductInfo(Integer id) {
-        //获取商品分类列表
-        Map<String, Object> map = new HashMap();
-        CmMallOrganizeProducts organizeProducts = cmMallOrganizeProductsService.get(id);
-        List<CmMallProductsClassify> listByEffective = cmMallProductsClassifyService.findListByEffective(organizeProducts.getOrganizeID());
-        map.put("organizeProducts", organizeProducts);
-        map.put("listByEffective", listByEffective);
-        return JsonModel.newInstance().success(map);
+        return JsonModel.newInstance().success(cmMallOrganizeProductsService.get(id));
     }
 
     /**
@@ -91,22 +74,11 @@ public class CmMallOrganizeProductsController {
      * @param cmMallOrganizeProducts
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "saveEditProductInfo", method = RequestMethod.POST)
+    @PostMapping(value = "saveEditProductInfo")
     public JsonModel saveEditProductInfo(@RequestBody CmMallOrganizeProducts cmMallOrganizeProducts, HttpServletRequest httpRequest) {
         JsonModel jsonModel = JsonModel.newInstance();
-        try {
-            String token = httpRequest.getHeader("token");
-            String decoded = TokenEncryptUtils.decoded(token);
-            String[] tokens = decoded.split("#,#");
-            CmMallAdminUser user = shiroService.findByUserId(Integer.valueOf(tokens[1]));
-            Long userId = user.getId().longValue();
-            cmMallOrganizeProducts.setUpdateTime(new Date());
-            cmMallOrganizeProductsService.updateProductInfo(cmMallOrganizeProducts, userId);
-            return jsonModel.success("修改成功", "");
-        } catch (Exception e) {
-            return jsonModel.error("修改失败");
-        }
+        cmMallOrganizeProductsService.updateProductInfo(cmMallOrganizeProducts);
+        return jsonModel.success("修改成功");
     }
 
     /**
@@ -115,11 +87,10 @@ public class CmMallOrganizeProductsController {
      * @param id 商品id
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "switchLine")
+    @GetMapping(value = "switchLine")
     public JsonModel switchLine(Integer id) {
         CmMallOrganizeProducts organizeProducts = cmMallOrganizeProductsService.get(id);
-        if (organizeProducts.getValidFlag().equals("1")) {
+        if ("1".equals(organizeProducts.getValidFlag())) {
             //下线商品
             organizeProducts.setPreferredProduct("0");
             organizeProducts.setCommonlyProduct("0");
@@ -139,8 +110,7 @@ public class CmMallOrganizeProductsController {
      * @param newProducSorttList (商品id-排序值,...)
      * @return
      */
-    @RequestMapping(value = "batchSaveSort")
-    @ResponseBody
+    @GetMapping(value = "batchSaveSort")
     public JsonModel batchSaveSort(String newProducSorttList, Integer modules) {
         JsonModel jsonModel = JsonModel.newInstance();
         try {
@@ -177,8 +147,7 @@ public class CmMallOrganizeProductsController {
      * @param page                   分页数据
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "toAddProduct1")
+    @GetMapping(value = "toAddProduct1")
     public JsonModel toAddProduct1(CmMallOrganizeProducts cmMallOrganizeProducts, Page page) {
         //获取采美所有商品
         Map<String, Object> map = new HashMap();
@@ -198,8 +167,7 @@ public class CmMallOrganizeProductsController {
      * @param cmMallOrganizeProducts
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "saveAddProductInfo", method = RequestMethod.POST)
+    @PostMapping(value = "saveAddProductInfo")
     public JsonModel saveAddProductInfo(@RequestBody CmMallOrganizeProducts cmMallOrganizeProducts) {
         JsonModel jsonModel = JsonModel.newInstance();
         try {
@@ -225,8 +193,7 @@ public class CmMallOrganizeProductsController {
      * @param cmMallOrganizeProducts
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "canncelProduct", method = RequestMethod.POST)
+    @PostMapping(value = "canncelProduct")
     public JsonModel canncelProduct(@RequestBody CmMallOrganizeProducts cmMallOrganizeProducts) {
         cmMallOrganizeProducts.setUpdateTime(new Date());
         cmMallOrganizeProductsService.canncelPreferredProduct(cmMallOrganizeProducts);

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

@@ -7,14 +7,12 @@ import com.caimei.modules.products.service.CmMallOrganizeProductsService;
 import com.caimei.modules.products.service.CmMallProductsClassifyService;
 import com.caimei.utils.JsonModel;
 import com.github.pagehelper.PageHelper;
+import lombok.RequiredArgsConstructor;
 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.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
@@ -26,20 +24,18 @@ import java.util.regex.Pattern;
  * @author lijun
  * @version 2019-12-03
  */
-@Controller
+@RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/product/cmMallProductsClassify")
 public class CmMallProductsClassifyController {
 
-    @Autowired
-    private CmMallProductsClassifyService cmMallProductsClassifyService;
-    @Autowired
-    private CmMallOrganizeProductsService cmMallOrganizeProductsService;
+    private final CmMallProductsClassifyService cmMallProductsClassifyService;
+    private final CmMallOrganizeProductsService cmMallOrganizeProductsService;
 
     /**
      * 商品分类列表
      */
-    @ResponseBody
-    @RequestMapping(value = {"list"})
+    @GetMapping(value = {"list"})
     public JsonModel list(CmMallProductsClassify cmMallProductsClassify, Page page) {
         PageHelper.startPage(page.getIndex(), page.getPageSize());
         List<CmMallProductsClassify> productsClassifyList = cmMallProductsClassifyService.findList(cmMallProductsClassify);
@@ -53,8 +49,7 @@ public class CmMallProductsClassifyController {
      * @param id
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "form")
+    @GetMapping(value = "form")
     public JsonModel form(Integer id) {
         CmMallProductsClassify mallProductsClassify = cmMallProductsClassifyService.get(id);
         return JsonModel.newInstance().success(mallProductsClassify);
@@ -66,8 +61,7 @@ public class CmMallProductsClassifyController {
      * @param cmMallProductsClassify
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "save", method = RequestMethod.POST)
+    @PostMapping(value = "save")
     public JsonModel save(@RequestBody CmMallProductsClassify cmMallProductsClassify) {
         JsonModel jsonModel = JsonModel.newInstance();
         //保存商品名字不能重复
@@ -102,8 +96,7 @@ public class CmMallProductsClassifyController {
      * @param id 分类id
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "switchClassify")
+    @GetMapping(value = "switchClassify")
     public JsonModel switchClassify(Integer id) {
         JsonModel jsonModel = JsonModel.newInstance();
         CmMallProductsClassify mallProductsClassify = cmMallProductsClassifyService.get(id);
@@ -130,8 +123,7 @@ public class CmMallProductsClassifyController {
      * @param newProducSorttList (分类id-排序值,...)
      * @return
      */
-    @ResponseBody
-    @RequestMapping(value = "batchSaveSort")
+    @GetMapping(value = "batchSaveSort")
     public JsonModel batchSaveSort(String newProducSorttList) {
         JsonModel jsonModel = JsonModel.newInstance();
         try {

src/main/java/com/caimei/modules/products/dao/CmMallOrganizeProductsDao.java

@@ -2,13 +2,18 @@ package com.caimei.modules.products.dao;
 
 import com.caimei.modules.products.entity.CmMallOrganizeProducts;
 import com.caimei.modules.products.entity.CmMallPageModules;
+import com.caimei.modules.products.entity.Sku;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * @author Administrator
+ */
 @Mapper
 public interface CmMallOrganizeProductsDao {
+
     List<CmMallOrganizeProducts> findList(CmMallOrganizeProducts cmMallOrganizeProducts);
 
     List<CmMallPageModules> findAllModule(Integer organizeID);
@@ -28,4 +33,8 @@ public interface CmMallOrganizeProductsDao {
     void updateProductInfo1(CmMallOrganizeProducts cop);
 
     void canncelPreferredProduct(CmMallOrganizeProducts cmMallOrganizeProducts);
+
+    List<Sku> findSkus(String productID);
+
+    void updateSku(Sku s);
 }

src/main/java/com/caimei/modules/products/entity/CmMallOrganizeProducts.java

@@ -1,5 +1,7 @@
 package com.caimei.modules.products.entity;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -10,6 +12,7 @@ import java.util.List;
  * @author lijun
  * @version 2019-12-04
  */
+@Data
 public class CmMallOrganizeProducts implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -19,10 +22,6 @@ public class CmMallOrganizeProducts implements Serializable {
     private String productID;        // 商品ID,具体对应product表
     private String normalPrice;        // 市场价
     private String costPrice;        // 成本价
-    /**
-     * '启用阶梯价格标识 0否 1是',
-     */
-    private String ladderPriceFlag;
     private String retailPrice;        // 售价
     private String minBuyNumber;        // 最小起订量
     private String preferredProduct;        // 是否是优选商品：0不是优选,1优选商品
@@ -35,19 +34,8 @@ public class CmMallOrganizeProducts implements Serializable {
     private Date addTime;        // 添加时间
     private Date updateTime;        // 更新时间
     private Integer modules;     //第几个模块
-    /**
-     * 阶梯价格
-     */
-    private List<CmMallProductLadderPrice> ladderPriceList;
-
-    public List<CmMallProductLadderPrice> getLadderPriceList() {
-        return ladderPriceList;
-    }
-
-    public void setLadderPriceList(List<CmMallProductLadderPrice> ladderPriceList) {
-        this.ladderPriceList = ladderPriceList;
-    }
 
+    private List<Sku> skus;
     //非小程序商城商品信息
     private String mainImage;//商品图片
     private String productName;//商品名称
@@ -57,207 +45,4 @@ public class CmMallOrganizeProducts implements Serializable {
     private String itemsList;//添加商品字符串
     private String existsFlag;//是否已存在小程序商品中 1已存在，其他都为不存在
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getClassifyID() {
-        return classifyID;
-    }
-
-    public void setClassifyID(String classifyID) {
-        this.classifyID = classifyID;
-    }
-
-    public String getOrganizeID() {
-        return organizeID;
-    }
-
-    public void setOrganizeID(String organizeID) {
-        this.organizeID = organizeID;
-    }
-
-    public String getProductID() {
-        return productID;
-    }
-
-    public void setProductID(String productID) {
-        this.productID = productID;
-    }
-
-    public String getNormalPrice() {
-        return normalPrice;
-    }
-
-    public void setNormalPrice(String normalPrice) {
-        this.normalPrice = normalPrice;
-    }
-
-    public String getCostPrice() {
-        return costPrice;
-    }
-
-    public void setCostPrice(String costPrice) {
-        this.costPrice = costPrice;
-    }
-
-    public String getLadderPriceFlag() {
-        return ladderPriceFlag;
-    }
-
-    public void setLadderPriceFlag(String ladderPriceFlag) {
-        this.ladderPriceFlag = ladderPriceFlag;
-    }
-
-    public String getRetailPrice() {
-        return retailPrice;
-    }
-
-    public void setRetailPrice(String retailPrice) {
-        this.retailPrice = retailPrice;
-    }
-
-    public String getMinBuyNumber() {
-        return minBuyNumber;
-    }
-
-    public void setMinBuyNumber(String minBuyNumber) {
-        this.minBuyNumber = minBuyNumber;
-    }
-
-    public String getPreferredProduct() {
-        return preferredProduct;
-    }
-
-    public void setPreferredProduct(String preferredProduct) {
-        this.preferredProduct = preferredProduct;
-    }
-
-    public String getCommonlyProduct() {
-        return commonlyProduct;
-    }
-
-    public void setCommonlyProduct(String commonlyProduct) {
-        this.commonlyProduct = commonlyProduct;
-    }
-
-    public String getPreferentialProduct() {
-        return preferentialProduct;
-    }
-
-    public void setPreferentialProduct(String preferentialProduct) {
-        this.preferentialProduct = preferentialProduct;
-    }
-
-    public String getValidFlag() {
-        return validFlag;
-    }
-
-    public void setValidFlag(String validFlag) {
-        this.validFlag = validFlag;
-    }
-
-    public String getPreferredProductSort() {
-        return preferredProductSort;
-    }
-
-    public void setPreferredProductSort(String preferredProductSort) {
-        this.preferredProductSort = preferredProductSort;
-    }
-
-    public String getCommonlyProductSort() {
-        return commonlyProductSort;
-    }
-
-    public void setCommonlyProductSort(String commonlyProductSort) {
-        this.commonlyProductSort = commonlyProductSort;
-    }
-
-    public String getPreferentialProductSort() {
-        return preferentialProductSort;
-    }
-
-    public void setPreferentialProductSort(String preferentialProductSort) {
-        this.preferentialProductSort = preferentialProductSort;
-    }
-
-    public Date getAddTime() {
-        return addTime;
-    }
-
-    public void setAddTime(Date addTime) {
-        this.addTime = addTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getModules() {
-        return modules;
-    }
-
-    public void setModules(Integer modules) {
-        this.modules = modules;
-    }
-
-    public String getMainImage() {
-        return mainImage;
-    }
-
-    public void setMainImage(String mainImage) {
-        this.mainImage = mainImage;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getShopName() {
-        return shopName;
-    }
-
-    public void setShopName(String shopName) {
-        this.shopName = shopName;
-    }
-
-    public String getProductClassifyName() {
-        return productClassifyName;
-    }
-
-    public void setProductClassifyName(String productClassifyName) {
-        this.productClassifyName = productClassifyName;
-    }
-
-    public String getItemsList() {
-        return itemsList;
-    }
-
-    public void setItemsList(String itemsList) {
-        this.itemsList = itemsList;
-    }
-
-    public String getExistsFlag() {
-        return existsFlag;
-    }
-
-    public void setExistsFlag(String existsFlag) {
-        this.existsFlag = existsFlag;
-    }
 }

src/main/java/com/caimei/modules/products/entity/Sku.java

@@ -0,0 +1,47 @@
+package com.caimei.modules.products.entity;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+
+@Data
+public class Sku {
+
+    private Integer productId;
+
+    /**
+     * 比例成本百分比
+     */
+    private Double costProportional;
+    /**
+     * 成本价选中标志：1固定成本 2比例成
+     */
+    private Integer costCheckFlag;
+
+    private Integer skuId;
+    /**
+     * 起订量
+     */
+    private Integer minBuyNumber;
+    /**
+     * 成本价
+     */
+    private Double costPrice;
+    /**
+     * 库存
+     */
+    private Integer stock;
+    /**
+     * 机构价格
+     */
+    private Double price;
+    /**
+     * 包装规格
+     */
+    private String unit;
+}

src/main/java/com/caimei/modules/products/service/CmMallOrganizeProductsService.java

@@ -14,7 +14,7 @@ public interface CmMallOrganizeProductsService {
 
     List<CmMallPageModules> findAllModule(Integer organizeID);
 
-    void updateProductInfo(CmMallOrganizeProducts cmMallOrganizeProducts, Long userId);
+    void updateProductInfo(CmMallOrganizeProducts cmMallOrganizeProducts);
 
     CmMallOrganizeProducts get(Integer id);
 

src/main/java/com/caimei/modules/products/service/impl/CmMallOrganizeProductsServiceImpl.java

@@ -6,6 +6,7 @@ import com.caimei.modules.products.dao.CmMallProductLadderPriceDao;
 import com.caimei.modules.products.entity.CmMallOrganizeProducts;
 import com.caimei.modules.products.entity.CmMallPageModules;
 import com.caimei.modules.products.entity.CmMallProductLadderPrice;
+import com.caimei.modules.products.entity.Sku;
 import com.caimei.modules.products.service.CmMallOrganizeProductsService;
 import com.caimei.utils.AppUtils;
 import com.github.pagehelper.PageHelper;
@@ -20,10 +21,10 @@ import java.util.List;
 
 @Service
 public class CmMallOrganizeProductsServiceImpl implements CmMallOrganizeProductsService {
+
     @Resource
     private CmMallOrganizeProductsDao cmMallOrganizeProductsDao;
-    @Resource
-    private CmMallProductLadderPriceDao cmMallProductLadderPriceDao;
+
     @Value("${malladmin.domain}")
     private String domain;
 
@@ -36,18 +37,7 @@ public class CmMallOrganizeProductsServiceImpl implements CmMallOrganizeProducts
     public Page<CmMallOrganizeProducts> findPage(Page page, CmMallOrganizeProducts cmMallOrganizeProducts) {
         PageHelper.startPage(page.getIndex(), page.getPageSize());
         List<CmMallOrganizeProducts> organizeProductsDaoList = cmMallOrganizeProductsDao.findList(cmMallOrganizeProducts);
-        if (CollectionUtils.isNotEmpty(organizeProductsDaoList)) {
-            for (CmMallOrganizeProducts c : organizeProductsDaoList) {
-                c.setMainImage(AppUtils.getProductImageURL(c.getMainImage(), 0, domain));
-                if ("1".equals(c.getLadderPriceFlag())){
-                    Long productId = c.getId().longValue();
-                    List<CmMallProductLadderPrice> ladderPriceList = cmMallProductLadderPriceDao.selectByProductId(productId);
-                    c.setLadderPriceList(ladderPriceList);
-                }
-            }
-        }
-        Page<CmMallOrganizeProducts> organizeProductsPage = new Page<>(organizeProductsDaoList);
-        return organizeProductsPage;
+        return new Page<>(organizeProductsDaoList);
     }
 
     @Override
@@ -56,46 +46,17 @@ public class CmMallOrganizeProductsServiceImpl implements CmMallOrganizeProducts
     }
 
     @Override
-    public void updateProductInfo(CmMallOrganizeProducts cmMallOrganizeProducts, Long userId) {
+    public void updateProductInfo(CmMallOrganizeProducts cmMallOrganizeProducts) {
+        List<Sku> skus = cmMallOrganizeProducts.getSkus();
+        skus.forEach(s -> cmMallOrganizeProductsDao.updateSku(s));
         cmMallOrganizeProductsDao.updateProductInfo(cmMallOrganizeProducts);
-        Long productId = cmMallOrganizeProducts.getId().longValue();
-        CmMallProductLadderPrice ladderPrice = new CmMallProductLadderPrice();
-        ladderPrice.setProductId(productId);
-        ladderPrice.setUpdateBy(userId);
-        ladderPrice.setUpdateDate(new Date());
-        if("1".equals(cmMallOrganizeProducts.getLadderPriceFlag())) {
-            List<CmMallProductLadderPrice> ladderPriceList = cmMallOrganizeProducts.getLadderPriceList();
-            for (CmMallProductLadderPrice item: ladderPriceList) {
-                ladderPrice.setLadderNum(item.getLadderNum());
-                ladderPrice.setBuyNum(item.getBuyNum());
-                ladderPrice.setBuyPrice(item.getBuyPrice());
-                ladderPrice.setDelFlag(item.getDelFlag());
-                Long ladderPriceId = cmMallProductLadderPriceDao.selectIdByProductIdAndLadderNum(productId, item.getLadderNum());
-                if (null !=ladderPriceId && ladderPriceId > 0L){
-                    ladderPrice.setId(ladderPriceId);
-                    cmMallProductLadderPriceDao.updateByPrimaryKeySelective(ladderPrice);
-                }else{
-                    ladderPrice.setCreateBy(userId);
-                    ladderPrice.setCreateDate(new Date());
-                    cmMallProductLadderPriceDao.insertSelective(ladderPrice);
-                }
-            }
-        }else{
-            List<CmMallProductLadderPrice> ladderPriceList = cmMallProductLadderPriceDao.selectByProductId(productId);
-            for (CmMallProductLadderPrice item: ladderPriceList) {
-                ladderPrice.setLadderNum(item.getLadderNum());
-                ladderPrice.setBuyNum(item.getBuyNum());
-                ladderPrice.setBuyPrice(item.getBuyPrice());
-                ladderPrice.setDelFlag("1");
-                ladderPrice.setId(item.getId());
-                cmMallProductLadderPriceDao.updateByPrimaryKeySelective(ladderPrice);
-            }
-        }
     }
 
     @Override
     public CmMallOrganizeProducts get(Integer id) {
-        return cmMallOrganizeProductsDao.get(id);
+        CmMallOrganizeProducts cmMallOrganizeProducts = cmMallOrganizeProductsDao.get(id);
+        cmMallOrganizeProducts.setSkus(cmMallOrganizeProductsDao.findSkus(cmMallOrganizeProducts.getProductID()));
+        return cmMallOrganizeProducts;
     }
 
     @Override
@@ -121,11 +82,6 @@ public class CmMallOrganizeProductsServiceImpl implements CmMallOrganizeProducts
                         c.setExistsFlag("1");
                     }
                 }
-                if ("1".equals(c.getLadderPriceFlag())){
-                    Long productId = c.getId().longValue();
-                    List<CmMallProductLadderPrice> ladderPriceList = cmMallProductLadderPriceDao.selectByProductId(productId);
-                    c.setLadderPriceList(ladderPriceList);
-                }
             }
         }
         return listBuyMall;

src/main/resources/mapper/CmMallOrganizeProductsMapper.xml

@@ -38,6 +38,8 @@
     <select id="findList" resultType="com.caimei.modules.products.entity.CmMallOrganizeProducts">
         SELECT
         <include refid="cmMallOrganizeProductsColumns"/>
+        (SELECT unit FROM cm_sku WHERE productId=a.productId ORDER BY price LIMIT 1) AS unit,
+        (SELECT price FROM cm_sku WHERE productId=a.productId ORDER BY price LIMIT 1) AS price
         FROM cm_mall_organize_products a
         <include refid="cmMallOrganizeProductsJoins"/>
         <where>
@@ -105,14 +107,9 @@
     </select>
 
     <update id="updateProductInfo">
-		UPDATE cm_mall_organize_products SET
-		classifyID = #{classifyID},
-		normalPrice = #{normalPrice},
-		costPrice = #{costPrice},
-        ladderPriceFlag = #{ladderPriceFlag},
-		retailPrice = #{retailPrice},
-		minBuyNumber = #{minBuyNumber},
-		updateTime = #{updateTime}
+		UPDATE cm_mall_organize_products
+		SET validFlag = #{validFlag},
+		    updateTime = now()
 		WHERE id = #{id}
 	</update>
 
@@ -209,6 +206,13 @@
         </if>
 	</select>
 
+    <select id="findSkus" resultType="com.caimei.modules.products.entity.Sku">
+        select cs.productId,cs.skuId,costProportional,costCheckFlag,costPrice,cmps.minBuyNumber,cmps.price,cs.unit
+        from cm_sku cs
+        left join cm_mall_product_sku cmps on cs.skuId = cmps.skuId
+        where cs.productId = #{productID}
+    </select>
+
     <update id="updateProductInfo1">
 		UPDATE cm_mall_organize_products SET
         <if test="modules == 1">
@@ -241,4 +245,11 @@
 		updateTime = #{updateTime}
 		WHERE id = #{id}
 	</update>
+
+    <update id="updateSku">
+        update cm_mall_product_sku
+        set minBuyNumber = #{minBuyNumber},
+            price = #{price}
+        where skuId = #{skuId}
+    </update>
 </mapper>

src/main/resources/mapper/CmUserMapper.xml

@@ -6,7 +6,10 @@
     <select id="findListBuyUserInfo" resultType="com.caimei.modules.club.entity.CmUser"
             parameterType="com.caimei.modules.club.entity.CmUser">
         SELECT
-        a.*
+        a.userName,
+        a.bindMobile,
+        a.clubStatus,
+        a.registerTime,
         ,c.linkMan AS "linkMan"
         ,t.name as "town"
         ,ci.name as "city"
@@ -54,6 +57,13 @@
         </where>
     </select>
 
+    <select id="findUserById" resultType="com.caimei.modules.club.entity.CmUser">
+            select c.name,c.businessLicenseImage,c.address,c.linkMan,c.contractPhone as mobile,
+            from club c
+            left join user u on c.userID = u.userID
+            where c.userID = #{userId}
+    </select>
+
     <insert id="insert" parameterType="com.caimei.modules.club.entity.CmUser" keyProperty="userID" useGeneratedKeys="true">
         INSERT INTO user(
         userOrganizeID,