Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!110

mp-admin/src/main/java/com/qs/mp/handler/auth/SignUtils.java

@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Value;
  *
  */
 public class SignUtils {
-    
+
     protected static Logger logger = LoggerFactory.getLogger(SignUtils.class);
     @Value("${sign.md5key}")
     private static String md5key = "3Jr8S1K18rcC1wAfv8";
@@ -36,12 +36,12 @@ public class SignUtils {
         }
         return hex.toString();
     }
-    
+
     public static boolean verifySign(String sign,String body,String timestamp) {
         String l = body+ "nonce"+ timestamp + md5key;
-        //logger.info("sign str:"+l);
+        logger.debug("sign str:"+l);
         String mySign = Md5Utils.hash(l);
-        //logger.info("mySign:"+mySign+" sign:"+sign);
+        logger.debug("mySign:"+mySign+" sign:"+sign);
         return mySign.equals(sign);
     }
 }

mp-common/src/main/java/com/qs/mp/common/enums/TicketBoxStatusEnum.java

@@ -14,8 +14,8 @@ public enum TicketBoxStatusEnum implements IEnum<String> {
   WAIT("wait", "待出票"),
   DOING("doing", "出票中"),
   DONE("done", "待上架"),
-  PUT_ON("on", "上架"),
-  PUT_OFF("off", "下架");
+  PUT_ON("on", "已上架"),
+  PUT_OFF("off", "已下架");
 
   private final String value;
   private final String desc;

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -101,9 +101,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
   public boolean createTicketBox(TicketBoxCreateParam param) {
     // 创建盲票组
     TicketBox ticketBox = mapperFacade.map(param, TicketBox.class);
-    if (ticketBox.getType() == TicketTypeEnum.OFFLINE) {
-      ticketBox.setPkgQty(ticketBox.getQuantity() / ticketBox.getPkgUnit());
-    }
+    ticketBox.setPkgQty(ticketBox.getQuantity() / ticketBox.getPkgUnit());
     ticketBox.setStatus(TicketBoxStatusEnum.WAIT);
     ticketBox.setBoxNo(ticketBoxSerialService.generateSerial(ticketBox.getType()));
     ticketBox.setBoxId(bizIdGenerator.newId());