增加放号充值达标数据

apply-net/src/main/java/com/winsun/controller/YxtCardController.java

@@ -79,14 +79,15 @@ public class YxtCardController extends BaseController {
      */
     @RequestMapping(value = "/weixinAuthorizati")
     public void weixinAuthorization(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException {
-        String requestURL = request.getContextPath().toString();
+        String requestURL = request.getContextPath();
         log.info(requestURL);
-        ///redirect_uri=http://167460x6b0.51mypc.cn/ciop/forgerpw/callBackLogin
-        String redirect_uri = "http://192.168.1.165:3000/#/yxt/pay?userId=6399";
+        String redirect_uri="http://167460x6b0.51mypc.cn/ciop/forgerpw/callBackLogin";
+        String redirect_uri2 = "http://192.168.1.165:3000/#/yxt/pay?userId=6399";
         String url = "https://open.weixin.qq.com/connect/oauth2/authorize?";
         url += "appid=" + WxConfig.APPID;
-        url += "&redirect_uri=" + URLEncoder.encode("http://167460x6b0.51mypc.cn/ciop/forgerpw/callBackLogin", "UTF-8");//此处和微信回调用的域名相同
+        url += "&redirect_uri=" + URLEncoder.encode(redirect_uri2, "UTF-8");//此处和微信回调用的域名相同
         url += "&response_type=code&scope=snsapi_userinfo&state=frommenu#wechat_redirect";
+
         try {
             response.sendRedirect(url);
         } catch (Exception e) {
@@ -137,10 +138,11 @@ public class YxtCardController extends BaseController {
         try{
             objectMap = new WxInterfacesUtil().getJspaiSign(url);
             objectMap.put("appid", WxConfig.APPID);
+            return ResponseData.success(objectMap);
         }catch(Exception e){
             e.printStackTrace();
         }
-        return ResponseData.success(objectMap);
+        return ResponseData.error("");
     }
     /**
     * 下单新增订单
@@ -274,7 +276,8 @@ public class YxtCardController extends BaseController {
     @RequestMapping("/activePay")
     public ResponseData<Map<String,Object>> activePay(
             @RequestParam("orderNum") String orderNum,
-            @RequestParam("totalPrice") Double totalPrice,@RequestParam("openId") String openId){
+            @RequestParam("totalPrice") Double totalPrice,
+            @RequestParam("openId") String openId){
         int totalPrice0 = (int)(totalPrice * 100);
         String nonceStr = Sha1Util.getNonceStr();
 
@@ -570,90 +573,6 @@ public class YxtCardController extends BaseController {
         return ResponseData.error("新增地址失败！！！");
     }
 
-    // 发起支付
-    public ResponseData<Map<String,Object>> activePay(String orderNum,double totalPrice){
-        int totalPricet = (int)(totalPrice * 100);
-        String nonceStr = Sha1Util.getNonceStr();
-
-        // 统一下单请求参数
-        PayRequest payRequest = new PayRequest();
-        payRequest.setAppid(WxConfig.APPID);
-        payRequest.setMch_id(WxConfig.MAC_ID);
-        payRequest.setNonce_str(nonceStr);
-        payRequest.setSign("sign");
-        payRequest.setBody("yuan_xian_tong");
-        payRequest.setOut_trade_no(orderNum);
-        payRequest.setTotal_fee(Integer.toString(totalPricet));
-        payRequest.setSpbill_create_ip("120.24.88.216");
-        payRequest.setNotify_url(WxConfig.NOTIFY_URL);
-        payRequest.setTrade_type("JSAPI");
-        //临时测试用
-        payRequest.setOpenid("o22lhwRZP2zbXff7UHH3J8oqH8A0");
-
-        //System.out.println("pay——openid:"+request.getSession().getAttribute("openId").toString());
-        //log.info("pay——openid:"+openId);
-        //payRequest.setOpenid(openId);
-
-        // 统一下单加密参数
-        SortedMap<Object,Object> parameters = new TreeMap<Object,Object>();
-        parameters.put("appid", payRequest.getAppid());
-        parameters.put("mch_id", payRequest.getMch_id());
-        parameters.put("nonce_str", payRequest.getNonce_str());
-        parameters.put("body", payRequest.getBody());
-        parameters.put("out_trade_no", payRequest.getOut_trade_no());
-        parameters.put("total_fee", payRequest.getTotal_fee());
-        parameters.put("spbill_create_ip", payRequest.getSpbill_create_ip());
-        parameters.put("notify_url", payRequest.getNotify_url());
-        parameters.put("trade_type", payRequest.getTrade_type());
-        parameters.put("openid", payRequest.getOpenid());
-
-        String sign = WXPayUtil.createSign("UTF-8", parameters);
-        payRequest.setSign(sign);
-
-        try{
-            Map<String, Object> map = ConvertMapBean.bean2map(payRequest);
-            String xmlStr = WXPayUtil.map2Xmlstring(map);
-            String url = "https://api.mch.weixin.qq.com/pay/unifiedorder";
-            String result = HTTPSClient.sendPostXml(url, xmlStr);
-            System.out.println(result);
-            Map<String, Object> resultMap = WXPayUtil.xmlString2Map(result);
-
-            long timeStamp = System.currentTimeMillis();
-            nonceStr = Sha1Util.getNonceStr();
-
-            // 加密参数
-            String packages = "prepay_id=" + resultMap.get("prepay_id").toString();
-            SortedMap<Object,Object> secretParams = new TreeMap<Object,Object>();
-            secretParams.put("timeStamp", timeStamp);
-            secretParams.put("nonceStr", nonceStr);
-            secretParams.put("package", packages);
-            secretParams.put("appId", WxConfig.APPID);
-            secretParams.put("signType", "MD5");
-            String secretSign = WXPayUtil.createSign("UTF-8", secretParams);
-
-            // 获取签名
-//			String params = "appid=wxfc18f5186b729d15&timestamp="+timeStamp+"&noncestr="+nonceStr+"&package="+resultMap.get("prepay_id")+"&signtype=MD5";
-//			MessageDigest crypt = MessageDigest.getInstance("MD5");
-//			crypt.reset();
-//			crypt.update(params.getBytes("UTF-8"));
-//			String signature = WxInterfacesUtil.byteToHex(crypt.digest());
-
-            Map<String,Object> objectMap = new HashMap<>();
-            objectMap.put("appId", WxConfig.APPID);
-            objectMap.put("timeStamp", timeStamp);
-            objectMap.put("nonceStr", nonceStr);
-            objectMap.put("package", packages);
-            objectMap.put("signType", "MD5");
-            objectMap.put("sign", secretSign);
-
-            return ResponseData.success(objectMap,"支付成功");
-        }catch(Exception e){
-            e.printStackTrace();
-        }
-        return ResponseData.error("支付失败");
-    }
-
-
 
     // 返回目前可购买兑换券数量
     public int returnCardNum(){

common/src/main/java/com/winsun/bean/SalesOrder.java

@@ -4,19 +4,21 @@ import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 @Data
 @TableName("hhr_sales_order")
-public class SalesOrder {
+public class SalesOrder implements Serializable {
 
+	private static final long serialVersionUID = -1093416820114819143L;
 	/**
 	 * 主键
 	 */
-	private int id;
+	private Integer id;
 	
 	/**
-	 * 订单号码
+	 * 放号号码
 	 */
 	private String orderPhone;
 	

service-manager/src/main/java/com/winsun/controller/LzKpiController.java

@@ -187,7 +187,7 @@ public class LzKpiController extends BaseController {
      * @param substName
      * @return
      */
-    @Permission(menuname = "初始县分", value = "getSchoolNames", method = RequestMethod.POST)
+    @Permission(menuname = "初始学校", value = "getSchoolNames", method = RequestMethod.POST)
     public ResponseData<List<School>> getSchoolNames(@RequestParam(name = "substName", required = false) String substName){
         Wrapper<School> schoolWrapper = new EntityWrapper<>();
         schoolWrapper.eq(StringUtils.isNotBlank(substName),"sub_name",substName);

service-manager/src/main/java/com/winsun/controller/LzSalaryController.java

@@ -453,6 +453,7 @@ public class LzSalaryController extends BaseController {
         }
         if(sysUserList.size()==0){
             log.error("查询数据为空！");
+            return;
         }
         List<Integer> schoolIds = new ArrayList<>();
         Wrapper<School> schoolWrapper = new EntityWrapper<>();
@@ -464,6 +465,7 @@ public class LzSalaryController extends BaseController {
         }
         if(schoolList.size()==0){
             log.error("查询数据为空！");
+            return;
         }
         List<String> userIds2 = new ArrayList<>();
         Wrapper<UserSchool> usWrapper = new EntityWrapper<>();
@@ -492,6 +494,7 @@ public class LzSalaryController extends BaseController {
         List<LzWage> lzWages = lzWageMpapper.selectList(wrapper);
         if(lzWages.size()==0){
             log.error("查询数据为空！");
+            return;
         }
         for (LzWage lzWage : lzWages) {
             Map<String,Object> map = new HashMap<>();

service-manager/src/main/java/com/winsun/utils/ExcelDealUtils.java

@@ -16,13 +16,15 @@ public class ExcelDealUtils {
 		List<String> names = (List<String>)headData.get("names");
 		List<String> columns =  (List<String>)headData.get("columns");
 
-		
 		XSSFWorkbook workbook = new XSSFWorkbook();
 		//创建工作表
         XSSFSheet sheet = workbook.createSheet(sheetName);
         //添加表头
         final XSSFRow row = sheet.createRow(0);
         //设置列宽度
+		for (int i=1 ;i <= columns.size();i++ ){
+			sheet.setColumnWidth(i, 2500);
+		}
 //        sheet.setColumnWidth(1, 6500);
 //        sheet.setColumnWidth(2, 6500);
 
@@ -46,6 +48,41 @@ public class ExcelDealUtils {
         return workbook;
 	}
 
+	@SuppressWarnings("unchecked")
+	public static XSSFWorkbook getWorkBook2(Map<String, Object> headData,List<Map<String,Object>> list,List<Integer> list1) {
+		String sheetName = headData.get("sheetName").toString();
+		List<String> names = (List<String>)headData.get("names");
+		List<String> columns =  (List<String>)headData.get("columns");
+
+		XSSFWorkbook workbook = new XSSFWorkbook();
+		//创建工作表
+		XSSFSheet sheet = workbook.createSheet(sheetName);
+		//添加表头
+		final XSSFRow row = sheet.createRow(0);
+		//设置列宽度
+		for (int i=0 ;i < list1.size();i++ ){
+			sheet.setColumnWidth(i, list1.get(i));
+		}
+		//第一行字段名称
+		names.forEach(column -> {
+			XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
+			cell.setCellValue(column);
+		});
+		//数据
+		int rowIndex = row.getRowNum();
+		for (Map<String, Object> maps: list) {
+			final XSSFRow rowdata = sheet.createRow(++rowIndex);
+			for (String column : columns) {
+				XSSFCell cell = rowdata.createCell(Math.max(rowdata.getLastCellNum(), 0));
+				if (maps.get(column) != null) {
+					cell.setCellValue(maps.get(column).toString());
+				}
+			}
+		}
+
+		return workbook;
+	}
+	
 	public static Map<String, Object> dealHeadMap(Map<String, Object> map){
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		List<String> names = new ArrayList<>();
@@ -144,7 +181,23 @@ public class ExcelDealUtils {
 
 		Map<String, Object> resultMap = dealHeadMap(headMap);
 		resultMap.put("sheetName", sheetName);
-
+		return resultMap;
+	}
+	// 导出放号充值达标清单excel表头
+	public static Map<String, Object> salesOrderExcel(String sheetName){
+		Map<String, Object> headMap = new LinkedHashMap<String, Object>();
+		headMap.put("放号号码", "orderPhone");
+		headMap.put("放号学校", "salesSchool");
+		headMap.put("放号县分", "salesSubst");
+		headMap.put("放号人", "name");
+		headMap.put("放号人账号", "account");
+		headMap.put("职位", "position");
+		headMap.put("上级领导", "leader");
+		headMap.put("总经理", "president");
+		headMap.put("上传时间", "createTime");
+		headMap.put("激活时间", "activateTime");
+		Map<String, Object> resultMap = dealHeadMap(headMap);
+		resultMap.put("sheetName", sheetName);
 		return resultMap;
 	}