app开发

ecd88f6c · 黄森林 · aba400d3 · ecd88f6c · ecd88f6c · ecd88f6c
Commit ecd88f6c authored Mar 09, 2020 by 黄森林
6 changed files
--- a/common/src/main/java/com/winsun/mapper/AppMapper.java
+++ b/common/src/main/java/com/winsun/mapper/AppMapper.java
@@ -24,8 +24,8 @@ public interface AppMapper extends BaseMapper<PackageUpgrade> {
    @Select("<script>SELECT * FROM `hhr_xyzx_yd_yrym_list` <where> ${ew.sqlSegment} </where> </script>")
    List<Map<String,Object>> selectPackage(@Param("ew") Wrapper<PackageUpgrade> wrapper);
-    @Insert("insert into `hhr_order_history` values(#{id},#{status},#{date}) ")
+    @Insert("insert into `hhr_order_history` values(#{id},#{status},#{date},#{operator}) ")
-    Integer inserOrderHis(@Param("id")String id, @Param("status")String status, @Param("date")Date date);
+    Integer inserOrderHis(@Param("id")String id, @Param("status")String status, @Param("date")Date date, @Param("operator")String operator);
    @Select("select *  from `hhr_order_history` where  order_id = #{oredrId}")
    List<Map<String,Object>> selectOrderHis(String oredrId);

--- a/common/src/main/java/com/winsun/mapper/OrderMapper.java
+++ b/common/src/main/java/com/winsun/mapper/OrderMapper.java
@@ -19,4 +19,7 @@ public interface OrderMapper extends BaseMapper<Order> {
    @Select("<script>SELECT * FROM `hhr_order` <where> ${ew.sqlSegment} </where> </script>")
    List<Map<String, Object>> downloadOrder(@Param("ew") Wrapper<Order> wrapper);
+    @Select("select *  from `hhr_order_history` where  order_id = #{oredrId}")
+    List<Map<String,Object>> selectOrderHis(String oredrId);
 }
--- a/apply-net/src/main/java/com/winsun/controller/PackageNewClothes.java
+++ b/apply-net/src/main/java/com/winsun/controller/PackageNewClothes.java
@@ -78,6 +78,7 @@ public class PackageNewClothes {
     *
     * @param cardId  套餐ID
     * @param partner 用户ID
+     * @param contNumber  套餐ID
     * @return
     */
    @RequestMapping(value = "getNumber", method = RequestMethod.POST)
@@ -101,7 +102,7 @@ public class PackageNewClothes {
    /**
     * 查询套餐详情
     *
-     * @param packageId
+     * @param packageId 套餐ID
     * @return
     */
    @RequestMapping(value = "selectPackageInfo", method = RequestMethod.POST)
@@ -215,7 +216,7 @@ public class PackageNewClothes {
        // MessageUtil.sent(contactNumber,"4","");
        if (insert == 1) {
-            appMapper.inserOrderHis(id, "资料已提交", date);
+            appMapper.inserOrderHis(id, "资料已提交", date,sysUser.getName());
            return ResponseData.success(id);
        }
        return ResponseData.error("开卡失败！");
@@ -333,7 +334,7 @@ public class PackageNewClothes {
        // MessageUtil.sent(contactNumber,"4","");
        if (insert == 1) {
-            appMapper.inserOrderHis(id, "资料已提交", date);
+            appMapper.inserOrderHis(id, "资料已提交", date,sysUser.getName());
            return ResponseData.success(id);
        }
        return ResponseData.error("开卡失败！");
@@ -467,7 +468,7 @@ public class PackageNewClothes {
        // MessageUtil.sent(contactNumber,"4","");
        if (insert == 1) {
-            appMapper.inserOrderHis(id, "资料提交成功,等待上传证件", date);
+            appMapper.inserOrderHis(id, "资料提交成功,等待上传证件", date,sysUser.getName());
            return ResponseData.success(id);
        }
        return ResponseData.error("开卡失败！");

--- a/apply-net/src/main/java/com/winsun/controller/ChooseController.java
+++ b/apply-net/src/main/java/com/winsun/controller/ChooseController.java
--- a/apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java
+++ b/apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java
@@ -4,11 +4,8 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
-import com.winsun.bean.SysUser;
-import com.winsun.bean.Order;
 import com.winsun.bean.Package;
-import com.winsun.bean.PackageUpgrade;
+import com.winsun.bean.*;
-import com.winsun.bean.YangChengTong;
 import com.winsun.constant.OrderStatus;
 import com.winsun.constant.UserType;
 import com.winsun.mapper.*;
@@ -23,7 +20,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 /**
@@ -249,7 +249,7 @@ public class PackageUpgradeController extends BaseController {
        order.setHehuorenSchool(schoolName);
        order.setHehuorenPhone(sysUser.getPhone());
        Integer insert = orderMapper.insert(order);
-        appMapper.inserOrderHis(id, "下单成功", date);
+        appMapper.inserOrderHis(id, "下单成功", date,sysUser.getName());
        // MessageUtil.sent(contactNumber,"4","");
        if (StringUtils.isNotBlank(mark)) {
            String id1 = UUID.randomUUID().toString();
@@ -268,7 +268,7 @@ public class PackageUpgradeController extends BaseController {
            yangChengTong.setContactPhone(contactNumber);
            yangChengTong.setCustomerPhone(businessNumber);
            insert += yangChengTongrMapper.insert(yangChengTong);
-            appMapper.inserOrderHis(id1, "下单成功", date);
+            appMapper.inserOrderHis(id1, "下单成功", date,sysUser.getName());
            return ResponseData.success(id + ":" + id1, "下单成功！");
        }
        if (insert == 1) {

--- a/service-manager/src/main/java/com/winsun/controller/OrderController.java
+++ b/service-manager/src/main/java/com/winsun/controller/OrderController.java
@@ -50,6 +50,14 @@ public class OrderController extends BaseController {
        OrderController.orderMapper = orderMapper;
    }
+    /**
+     * 查询订单历史状态
+     */
+    @RequestMapping(value = "selectOrderHis", method = RequestMethod.POST)
+    public ResponseData<List<Map<String, Object>>> selectOrderHis(@RequestParam("orderId") String orderId) {
+        List<Map<String, Object>> list = orderMapper.selectOrderHis(orderId);
+        return ResponseData.success(list);
+    }
    /**
     * 
@@ -66,7 +74,6 @@ public class OrderController extends BaseController {
     * @param hehuorenName  合伙人姓名
     * @param orderStatus  订单状态
     * @param customerName  客户姓名
-     * @param pageIndex
     * @param pageSize
     * @return
     */
@@ -98,8 +105,9 @@ public class OrderController extends BaseController {
        wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);
        wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
        wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName,SqlLike.DEFAULT);
-        wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus);
+        if (StringUtils.isNotBlank(orderStatus)) {
+            wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", OrderStatus.findById(orderStatus).getName());
+        }
        Page<Order> page = new Page<>(pageNo, pageSize);
        List<Order> aPackage = orderMapper.selectPage(page, wrapper);
        page.setRecords(aPackage);
@@ -139,9 +147,11 @@ public class OrderController extends BaseController {
        wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);
        wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
        wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName,SqlLike.DEFAULT);
-        wrapper.eq(StringUtils.isNotBlank(orderStatus), "status", orderStatus);
+      //  wrapper.eq(StringUtils.isNotBlank(orderStatus), "status", orderStatus);
+        if (StringUtils.isNotBlank(orderStatus)) {
-        List<Map<String, Object>> Orders = orderMapper.downloadOrder(wrapper);
+            wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", OrderStatus.findById(orderStatus).getName());
+        }
+        List<Map<String, Object>> orders = orderMapper.downloadOrder(wrapper);
        List<String> tops = new ArrayList<>();
        tops.add("客户姓名");
        tops.add("订单编号");
@@ -180,15 +190,18 @@ public class OrderController extends BaseController {
            //添加表头
            final XSSFRow row = sheet.createRow(0);
            //设置列宽度
-            sheet.setColumnWidth(1, 6500);
+            sheet.setColumnWidth(1, 5000);
-            sheet.setColumnWidth(2, 6500);
+            sheet.setColumnWidth(2, 4000);
-            sheet.setColumnWidth(5, 7000);
+            sheet.setColumnWidth(3, 4000);
-            sheet.setColumnWidth(8, 4000);
+            sheet.setColumnWidth(4, 4000);
-            sheet.setColumnWidth(11, 6500);
+            sheet.setColumnWidth(5, 3500);
-            sheet.setColumnWidth(14, 6500);
+            sheet.setColumnWidth(6, 6000);
-            sheet.setColumnWidth(15, 7000);
+            sheet.setColumnWidth(7, 4000);
-            sheet.setColumnWidth(17, 7500);
+            sheet.setColumnWidth(8, 3000);
-            sheet.setColumnWidth(18, 600);
+            sheet.setColumnWidth(9, 3000);
+            sheet.setColumnWidth(10, 3000);
+            sheet.setColumnWidth(11, 3000);
+            sheet.setColumnWidth(12, 4000);
            //第一行字段名称
            tops.forEach(column -> {
                XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
@@ -196,7 +209,7 @@ public class OrderController extends BaseController {
            });
            //数据
            int rowIndex = row.getRowNum();
-            for (Map<String, Object> maps: Orders) {
+            for (Map<String, Object> maps: orders) {
                final XSSFRow rowdata = sheet.createRow(++rowIndex);
                for (String column : columns) {
                    XSSFCell cell = rowdata.createCell(Math.max(rowdata.getLastCellNum(), 0));